akabei 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0179b8c29f60792ba543f606fad022ba8f278a16
-  data.tar.gz: aaf31e3fcc70cdc34f9c7658b82a76b608e4ece0
+  metadata.gz: 3eb09aa9bd6389e16b3f858e97653c851f779c91
+  data.tar.gz: 101a687e2f16c2f58b7bfabc50789852a98e045f
 SHA512:
-  metadata.gz: b7e2b018c3e2f93d200878bb9289f85de1f6ab40860cd0de1a976ca0a6da21b06b1590da43d243c04617691ae668c170a2983773c30e5f42033961983330da46
-  data.tar.gz: b012b634e2d0c5346b59e90cecdf5f64f4739f8047fb71a55d6055476a9c73fd7f796c3845389513ee958aa93cfc77701b98ce6f4528ad7e45526d7a91791c09
+  metadata.gz: 3d8d0e2e2c012a44f834da8447c8307ea9d3751b833ff5ef18b0268bab9d9269082c07a36629f9513d22f6841af2af053dc90265913165dae2c65da99577e4c7
+  data.tar.gz: 687f42c50a6ce54c338a5b6f519ee9ea1f8fb53642cc8c340a87f58f0c0922b1734cade396b47e86df13d3357e8ac6f2e7a47520885c78229d7852152de4098d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.4.0 (2014-11-02)
+- Switch to AWS SDK for Ruby v2
+
 # 0.3.5 (2014-05-09)
 - Update makepkg.conf template for pacman 4.1.2-6
 

data/akabei.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "libarchive"
   spec.add_dependency "safe_yaml"
   spec.add_dependency "thor"
-  spec.add_development_dependency "aws-sdk"
+  spec.add_development_dependency "aws-sdk-resources"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
+  spec.add_development_dependency "rspec", ">= 3.0"
   spec.add_development_dependency "simplecov"
 end

data/lib/akabei/omakase/cli.rb

@@ -44,9 +44,9 @@ module Akabei
 
         if options[:s3]
           begin
-            require 'aws-sdk'
+            require 'aws-sdk-resources'
           rescue LoadError => e
-            say("WARNING: You don't have aws-sdk installed. Disable S3 repository.", :yellow)
+            say("WARNING: You don't have aws-sdk-resources installed. Disable S3 repository.", :yellow)
             options[:s3] = false
           end
         end

data/lib/akabei/omakase/s3.rb

@@ -3,12 +3,12 @@ module Akabei
     class S3
       def initialize(aws_config, shell)
         if aws_config
-          require 'aws-sdk'
-          @bucket = AWS::S3.new(
+          require 'aws-sdk-resources'
+          @bucket = Aws::S3::Resource.new(
             access_key_id: aws_config['access_key_id'],
             secret_access_key: aws_config['secret_access_key'],
             region: aws_config['region'],
-          ).buckets[aws_config['bucket']]
+          ).bucket(aws_config['bucket'])
           @write_options = aws_config['write_options']
           @shell = shell
         end
@@ -34,11 +34,11 @@ module Akabei
       def get(path)
         @shell.say("Download #{path}", :blue)
         path.open('wb') do |f|
-          @bucket.objects[path.to_s].read do |chunk|
+          @bucket.object(path.to_s).get do |chunk|
             f.write(chunk)
           end
         end
-      rescue AWS::S3::Errors::NoSuchKey
+      rescue Aws::S3::Errors::NoSuchKey
         @shell.say("S3: #{path} not found", :red)
         FileUtils.rm_f(path)
       end
@@ -64,7 +64,12 @@ module Akabei
 
       def put(path, mime_type)
         @shell.say("Upload #{path}", :green)
-        @bucket.objects[path.to_s].write(path, @write_options.merge(content_type: mime_type))
+        path.open do |f|
+          @bucket.object(path.to_s).put(@write_options.merge(
+            body: f,
+            content_type: mime_type,
+          ))
+        end
       end
     end
   end

data/lib/akabei/omakase/templates/.akabei.yml.tt

@@ -19,6 +19,6 @@ s3:
   region:
   write_options:
     # :acl: :public_read
-    # :reduced_redundancy: false
+    # :storage_class: REDUCED_REDUNDANCY
     # :server_side_encryption: :aes256
 <%- end -%>

data/lib/akabei/version.rb

@@ -1,3 +1,3 @@
 module Akabei
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/spec/akabei/omakase/cli_spec.rb

@@ -94,10 +94,8 @@ describe Akabei::Omakase::CLI do
       let(:bucket_name) { 'test.bucket.name' }
       let(:region) { 'ap-northeast-1' }
 
-      let(:buckets) { double('S3::BucketCollection') }
       let(:bucket) { double('S3::Bucket') }
-      let(:objects) { double('S3::ObjectCollection') }
-      let(:write_options) { { reduced_redundancy: true } }
+      let(:write_options) { { storage_class: 'REDUCED_REDUNDANCY' } }
 
       before do
         c = SafeYAML.load_file('.akabei.yml')
@@ -107,31 +105,28 @@ describe Akabei::Omakase::CLI do
         c['s3']['region'] = region
         c['s3']['write_options'] = write_options
         open('.akabei.yml', 'w') { |f| YAML.dump(c, f) }
-
-        allow_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
       end
 
       it 'uploads built packages and update repositories' do
         %w[i686 x86_64].each do |arch|
           setup_command_expectations(arch, config.package_dir('nkf'))
         end
-        expect(buckets).to receive(:[]).with(bucket_name).and_return(bucket)
-        allow(bucket).to receive(:objects).and_return(objects)
+        allow_any_instance_of(Aws::S3::Resource).to receive(:bucket).with(bucket_name).and_return(bucket)
 
         %w[i686 x86_64].each do |arch|
           %w[test.db test.files test.abs.tar.gz].each do |fname|
             obj = double("S3::Object #{fname}")
             # download and upload
-            expect(objects).to receive(:[]).with("test/os/#{arch}/#{fname}").twice.and_return(obj)
-            expect(obj).to receive(:read).and_yield('')
-            expect(obj).to receive(:write)
+            expect(bucket).to receive(:object).with("test/os/#{arch}/#{fname}").twice.and_return(obj)
+            expect(obj).to receive(:get).and_yield('')
+            expect(obj).to receive(:put)
           end
 
           # upload only
           pkg = double("S3::Object built package (#{arch})")
           db_name = "nkf-2.1.3-1-#{arch}.pkg.tar.xz"
-          expect(objects).to receive(:[]).with("test/os/#{arch}/#{db_name}").and_return(pkg)
-          expect(pkg).to receive(:write).with(anything, hash_including(write_options))
+          expect(bucket).to receive(:object).with("test/os/#{arch}/#{db_name}").and_return(pkg)
+          expect(pkg).to receive(:put).with(hash_including(write_options))
         end
 
         cli.invoke(:build, ['nkf'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akabei
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,16 +126,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement