From 16d00247f3f205225967e99a24186d8a871acde6 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 31 Jul 2017 15:53:09 -0500
Subject: Bring activestorage dependencies into the general Gemfile

---
 Gemfile                    |  13 +++
 activestorage/Gemfile.lock | 233 ---------------------------------------------
 rails.gemspec              |   1 +
 3 files changed, 14 insertions(+), 233 deletions(-)
 delete mode 100644 activestorage/Gemfile.lock

diff --git a/Gemfile b/Gemfile
index 9a07908885..541f2e8c81 100644
--- a/Gemfile
+++ b/Gemfile
@@ -92,6 +92,19 @@ group :cable do
   gem "sprockets-export", require: false
 end
 
+group :storage do
+  gem "httparty"
+
+  gem "aws-sdk", "~> 2", require: false
+  gem "google-cloud-storage", "~> 1.3", require: false
+
+  # Contains fix to be able to test using StringIO
+  gem 'azure-core', git: "https://github.com/dixpac/azure-ruby-asm-core.git"
+  gem 'azure-storage', require: false
+
+  gem "mini_magick"
+end
+
 # Add your own local bundler stuff.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile
diff --git a/activestorage/Gemfile.lock b/activestorage/Gemfile.lock
deleted file mode 100644
index 7388096778..0000000000
--- a/activestorage/Gemfile.lock
+++ /dev/null
@@ -1,233 +0,0 @@
-GIT
-  remote: https://github.com/dixpac/azure-ruby-asm-core.git
-  revision: 4403389747f44a94b73e7a7522d1ea11f8b1a266
-  specs:
-    azure-core (0.1.8)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.10)
-      nokogiri (~> 1.7)
-
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 127b475dc251a06942fe0cd2de2e0545cf5ed69f
-  specs:
-    actioncable (5.2.0.alpha)
-      actionpack (= 5.2.0.alpha)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.2.0.alpha)
-      actionpack (= 5.2.0.alpha)
-      actionview (= 5.2.0.alpha)
-      activejob (= 5.2.0.alpha)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.0.alpha)
-      actionview (= 5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-      globalid (>= 0.3.6)
-    activemodel (5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-    activerecord (5.2.0.alpha)
-      activemodel (= 5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-      arel (~> 8.0)
-    activesupport (5.2.0.alpha)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    rails (5.2.0.alpha)
-      actioncable (= 5.2.0.alpha)
-      actionmailer (= 5.2.0.alpha)
-      actionpack (= 5.2.0.alpha)
-      actionview (= 5.2.0.alpha)
-      activejob (= 5.2.0.alpha)
-      activemodel (= 5.2.0.alpha)
-      activerecord (= 5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0.alpha)
-      sprockets-rails (>= 2.0.0)
-    railties (5.2.0.alpha)
-      actionpack (= 5.2.0.alpha)
-      activesupport (= 5.2.0.alpha)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: .
-  specs:
-    activestorage (0.1)
-      rails (>= 5.2.0.alpha)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    arel (8.0.0)
-    ast (2.3.0)
-    aws-sdk (2.10.7)
-      aws-sdk-resources (= 2.10.7)
-    aws-sdk-core (2.10.7)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.10.7)
-      aws-sdk-core (= 2.10.7)
-    aws-sigv4 (1.0.0)
-    azure-storage (0.11.4.preview)
-      azure-core (~> 0.1)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.10)
-      nokogiri (~> 1.6)
-    builder (3.2.3)
-    byebug (9.0.6)
-    concurrent-ruby (1.0.5)
-    declarative (0.0.9)
-    declarative-option (0.1.0)
-    digest-crc (0.4.1)
-    erubi (1.6.1)
-    faraday (0.12.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.0)
-      faraday (>= 0.7.4, < 1.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    google-api-client (0.13.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-    google-cloud-core (1.0.0)
-      google-cloud-env (~> 1.0)
-      googleauth (~> 0.5.1)
-    google-cloud-env (1.0.1)
-      faraday (~> 0.11)
-    google-cloud-storage (1.3.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.13.0)
-      google-cloud-core (~> 1.0)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    httparty (0.15.5)
-      multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
-    i18n (0.8.6)
-    jmespath (1.3.1)
-    jwt (1.5.6)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    memoist (0.16.0)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_magick (4.8.0)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    multi_json (1.12.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    os (0.9.6)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.0.2)
-    rubocop (0.49.1)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    signet (0.7.3)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (~> 1.5)
-      multi_json (~> 1.10)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    uber (0.1.0)
-    unicode-display_width (1.3.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activestorage!
-  aws-sdk (~> 2)
-  azure-core!
-  azure-storage
-  bundler (~> 1.15)
-  byebug
-  google-cloud-storage (~> 1.3)
-  httparty
-  mini_magick
-  rails!
-  rake
-  rubocop
-  sqlite3
-
-BUNDLED WITH
-   1.15.3
diff --git a/rails.gemspec b/rails.gemspec
index 1dbd86d2fb..31eee025bf 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency "actionmailer",  version
   s.add_dependency "activejob",     version
   s.add_dependency "actioncable",   version
+  s.add_dependency "activestorage", version
   s.add_dependency "railties",      version
 
   s.add_dependency "bundler",         ">= 1.3.0"
-- 
cgit v1.2.3