Merge pull request #221 from platanus/aws-specify

Remove unnecesary aws-sdk gems
platanus · Aug 3, 2019 · 1bc3a44 · 1bc3a44
2 parents 9b01602 + f89f635
commit 1bc3a44
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/lib/potassium/assets/aws.rb b/lib/potassium/assets/aws.rb
diff --git a/lib/potassium/recipes/aws_sdk.rb b/lib/potassium/recipes/aws_sdk.rb
diff --git a/lib/potassium/recipes/file_storage.rb b/lib/potassium/recipes/file_storage.rb
@@ -48,7 +48,7 @@ def config_rspec_for_paperclip
   end
 
   def add_paperclip
-    gather_gem 'paperclip', '~> 5.0'
+    gather_gem 'paperclip', '~> 6.0'
     application paperclip_config, env: 'production'
     append_to_file '.gitignore', "/public/system/*\n"
   end
@@ -63,6 +63,7 @@ def add_active_storage
   end
 
   def common_setup
+    gather_gem 'aws-sdk-s3', '~> 1.0'
     add_readme_section :internal_dependencies, get(:storage)
     append_to_file '.env.development', "S3_BUCKET=\n"
   end

diff --git a/lib/potassium/templates/application.rb b/lib/potassium/templates/application.rb
@@ -49,7 +49,6 @@
   create :ruby
   create :yarn
   create :editorconfig
-  create :aws_sdk
   create :mailer
   create :background_processor
   create :schedule

diff --git a/spec/features/file_storage_spec.rb b/spec/features/file_storage_spec.rb
@@ -8,6 +8,11 @@
       create_dummy_project(storage: :active_storage)
     end
 
+    it "adds the aws-sdk-s3 gem to Gemfile" do
+      gemfile_content = IO.read("#{project_path}/Gemfile")
+      expect(gemfile_content).to include("gem 'aws-sdk-s3'")
+    end
+
     it "customizes config file" do
       content = IO.read("#{project_path}/config/storage.yml")
       expect(content).to include("bucket: <%= ENV['S3_BUCKET'] %>")
@@ -41,6 +46,11 @@
       expect(gemfile_content).to include("gem 'paperclip'")
     end
 
+    it "adds the aws-sdk-s3 gem to Gemfile" do
+      gemfile_content = IO.read("#{project_path}/Gemfile")
+      expect(gemfile_content).to include("gem 'aws-sdk-s3'")
+    end
+
     it "adds brief to README file" do
       content = IO.read("#{project_path}/README.md")
       expect(content).to include("Paperclip")

diff --git a/spec/features/new_project_spec.rb b/spec/features/new_project_spec.rb
@@ -26,14 +26,6 @@
     expect(gemfile).to include %{gem 'pg'}
   end
 
-  it "configures aws" do
-    gemfile_content = IO.read("#{project_path}/Gemfile")
-    expect(gemfile_content).to include("'aws-sdk', '~> 3'")
-
-    initializer = IO.read("#{project_path}/config/initializers/aws.rb")
-    expect(initializer).to include("Aws::VERSION")
-  end
-
   it "configures the correct ruby version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")