mamiya 0.0.1.alpha17 → 0.0.1.alpha18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa254b596631cde33d5d8faac01f61d64714384
-  data.tar.gz: bef9bacf0b8706d6ea1f963fd2f9417a9121b07d
+  metadata.gz: 6db58a4aec3a8f7f2929cd2664c6e303f902bb9c
+  data.tar.gz: e37776e176631e187e95a8b6b2775d33180a8ac3
 SHA512:
-  metadata.gz: c9fd3931a0e2cc4203451ede0e03cc5aee3abb9c63ffdb1ae042c2514a81bc8dbe625e3542646e4bd55622f092308d6c9e296033fca7403cf343cd0375469859
-  data.tar.gz: 7ac1a6a440fc39b59fcfd29d7e643900a203e21de74261edffb1c5ea8a6fa090568a7c9d718938c594217a6fe23c6b010de5e0fe9ba12d44413e8da60ef01417
+  metadata.gz: 7f2675131a259a228697439db198a6394b6e0c9b4fd8d7934c98cc2c47a32e40ebfe67eba878dd1ded48ef299351ba6a6bec9aa17252081847539256082ff265
+  data.tar.gz: fb8a0ffb6701073386fcd62a22de3f5d5f7140c420ce0eced26c270037dc141ba5f8b94e1bcf2d214963b1fea25cfd3d5c7b01c90de6696217975c485411b067

data/lib/mamiya/agent/handlers/fetch.rb

@@ -39,15 +39,20 @@ module Mamiya
             }
           ) do |error|
             if error && IGNORED_ERRORS.lazy.grep(error.class).none?
-              agent.serf.event(FETCH_ERROR_EVENT,
-                {
-                  name: agent.serf.name,
-                  application: payload['application'],
-                  package: payload['package'],
-                  error: error.inspect,
-                  pending: agent.fetcher.queue_size,
-                }.to_json
-              )
+              # FIXME: TODO: may exceed 256
+              begin
+                agent.serf.event(FETCH_ERROR_EVENT,
+                  {
+                    name: agent.serf.name,
+                    application: payload['application'],
+                    package: payload['package'],
+                    error: error.class,
+                    pending: agent.fetcher.queue_size,
+                  }.to_json
+                )
+              rescue Villein::Client::SerfError => e
+                agent.logger.error "error sending fetch error event: #{e.inspect}"
+              end
             else
               agent.serf.event(FETCH_SUCCESS_EVENT,
                 {

data/lib/mamiya/storages/s3.rb

@@ -100,7 +100,7 @@ module Mamiya
       end
 
       def self.initiate_s3_with_config(config) # :nodoc:
-        Aws::S3.new(s3_config(config))
+        Aws::S3::Client.new(s3_config(config))
       end
 
       def self.s3_config(base) # :nodoc:

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha17"
+  VERSION = "0.0.1.alpha18"
 end

data/mamiya.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor", ">= 0.18.1"
-  spec.add_runtime_dependency "aws-sdk-core", "2.0.0.rc6"
+  spec.add_runtime_dependency "aws-sdk-core", "2.0.0.rc14"
   spec.add_runtime_dependency "term-ansicolor", ">= 1.3.0"
   unless ENV["MAMIYA_VILLEIN_PATH"]
     spec.add_runtime_dependency "villein", ">= 0.3.2"

data/spec/agent/handlers/fetch_spec.rb

@@ -102,7 +102,7 @@ describe Mamiya::Agent::Handlers::Fetch do
         'mamiya:fetch-result:error',
         {
           name: serf.name, application: 'app', package: 'package',
-          error: error.inspect, pending: 0,
+          error: error.class, pending: 0,
         }.to_json,
       )
 

data/spec/storages/s3_spec.rb

@@ -39,7 +39,7 @@ describe Mamiya::Storages::S3 do
   end
 
   before do
-    allow(Aws::S3).to receive(:new).with(foo: :bar, access_key_id: 'AKI', secret_access_key: 'secret', region: 'ap-northeast-1').and_return(s3)
+    allow(Aws::S3::Client).to receive(:new).with(foo: :bar, access_key_id: 'AKI', secret_access_key: 'secret', region: 'ap-northeast-1').and_return(s3)
   end
 
   describe "#push(package)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha17
+  version: 0.0.1.alpha18
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc6
+        version: 2.0.0.rc14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc6
+        version: 2.0.0.rc14
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement