akabei 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb09aa9bd6389e16b3f858e97653c851f779c91
-  data.tar.gz: 101a687e2f16c2f58b7bfabc50789852a98e045f
+  metadata.gz: 52604057edd7d358099dee7d00be7e1f4a82a4b0
+  data.tar.gz: bd75e223fcefc7464911e31b588abaa9b587858d
 SHA512:
-  metadata.gz: 3d8d0e2e2c012a44f834da8447c8307ea9d3751b833ff5ef18b0268bab9d9269082c07a36629f9513d22f6841af2af053dc90265913165dae2c65da99577e4c7
-  data.tar.gz: 687f42c50a6ce54c338a5b6f519ee9ea1f8fb53642cc8c340a87f58f0c0922b1734cade396b47e86df13d3357e8ac6f2e7a47520885c78229d7852152de4098d
+  metadata.gz: ae4b2aa2c1894092876336e80a112cc8d801f7bc4bd977c1b40645f3f17e41f7ec78eef9bec9239c631b080e7d26a64411c52ffc70903cd2c5fdad7d42fb3c66
+  data.tar.gz: 935f90dd05513568b2b6709fa58b10ede079cf5318fa9b2a349cdee8d1341f405cb79b29f28977f0baaf219cd12735fefdba8999d4880ac5c2b5bde0b75d0923

data/.travis.yml

@@ -2,11 +2,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1
+  - 2.2
   - ruby-head
 before_install:
   - sudo apt-get install -y libarchive-dev
-  - export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.4.1 (2015-01-10)
+- Do not depend on aws-sdk-resources
+
 # 0.4.0 (2014-11-02)
 - Switch to AWS SDK for Ruby v2
 

data/akabei.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "libarchive"
   spec.add_dependency "safe_yaml"
   spec.add_dependency "thor"
-  spec.add_development_dependency "aws-sdk-resources"
+  spec.add_development_dependency "aws-sdk-core"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake"

data/lib/akabei/omakase/cli.rb

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

data/lib/akabei/omakase/s3.rb

@@ -3,23 +3,24 @@ module Akabei
     class S3
       def initialize(aws_config, shell)
         if aws_config
-          require 'aws-sdk-resources'
-          @bucket = Aws::S3::Resource.new(
+          require 'aws-sdk-core'
+          @s3 = Aws::S3::Client.new(
             access_key_id: aws_config['access_key_id'],
             secret_access_key: aws_config['secret_access_key'],
             region: aws_config['region'],
-          ).bucket(aws_config['bucket'])
+          )
+          @bucket_name = aws_config['bucket']
           @write_options = aws_config['write_options']
           @shell = shell
         end
       end
 
       def before!(config, arch)
-        download_repository(config, arch) if @bucket
+        download_repository(config, arch) if @s3
       end
 
       def after!(config, arch, packages)
-        upload_repository(config, arch, packages) if @bucket
+        upload_repository(config, arch, packages) if @s3
       end
 
       def download_repository(config, arch)
@@ -33,11 +34,11 @@ module Akabei
 
       def get(path)
         @shell.say("Download #{path}", :blue)
-        path.open('wb') do |f|
-          @bucket.object(path.to_s).get do |chunk|
-            f.write(chunk)
-          end
-        end
+        @s3.get_object(
+          bucket: @bucket_name,
+          key: path.to_s,
+          response_target: path,
+        )
       rescue Aws::S3::Errors::NoSuchKey
         @shell.say("S3: #{path} not found", :red)
         FileUtils.rm_f(path)
@@ -65,10 +66,14 @@ module Akabei
       def put(path, mime_type)
         @shell.say("Upload #{path}", :green)
         path.open do |f|
-          @bucket.object(path.to_s).put(@write_options.merge(
-            body: f,
-            content_type: mime_type,
-          ))
+          @s3.put_object(
+            @write_options.merge(
+              bucket: @bucket_name,
+              key: path.to_s,
+              body: f,
+              content_type: mime_type,
+            )
+          )
         end
       end
     end

data/lib/akabei/version.rb

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

data/spec/akabei/omakase/cli_spec.rb

@@ -94,7 +94,7 @@ describe Akabei::Omakase::CLI do
       let(:bucket_name) { 'test.bucket.name' }
       let(:region) { 'ap-northeast-1' }
 
-      let(:bucket) { double('S3::Bucket') }
+      let(:s3_client) { double('S3::Client') }
       let(:write_options) { { storage_class: 'REDUCED_REDUNDANCY' } }
 
       before do
@@ -105,28 +105,38 @@ 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(Aws::S3::Client).to receive(:new).and_return(s3_client)
       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
-        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(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)
+            key = "test/os/#{arch}/#{fname}"
+            expect(s3_client).to receive(:get_object).with(hash_including(
+              bucket: bucket_name,
+              key: key,
+            )).once
+            expect(s3_client).to receive(:put_object).with(hash_including(
+              bucket: bucket_name,
+              key: key,
+            )).once
           end
 
           # upload only
           pkg = double("S3::Object built package (#{arch})")
           db_name = "nkf-2.1.3-1-#{arch}.pkg.tar.xz"
-          expect(bucket).to receive(:object).with("test/os/#{arch}/#{db_name}").and_return(pkg)
-          expect(pkg).to receive(:put).with(hash_including(write_options))
+          expect(s3_client).to receive(:put_object).with(hash_including(
+            write_options.merge(
+              bucket: bucket_name,
+              key: "test/os/#{arch}/#{db_name}",
+            )
+          )).once
         end
 
         cli.invoke(:build, ['nkf'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akabei
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-01-10 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-resources
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Custom repository manager for ArchLinux pacman