ey_enzyme 0.9.40 → 0.9.41

data/lib/ey_enzyme/api.rb

@@ -5,7 +5,7 @@ module EY::Enzyme
       @instance_id = instance_id
       @token       = token
       @logger      = MultiLogger.new(log_file)
-      @rest        = RestClient::Resource.new(api_url)
+      @rest        = RestClient::Resource.new(api_url, :timeout => api_rest_timeout_seconds)
     end
 
     def report(message)
@@ -60,16 +60,29 @@ module EY::Enzyme
 
     def call_api(path, opts={})
       @logger.debug "API call path: #{path.inspect}, data: #{opts.inspect}"
-      JSON.parse(@rest[path].post(opts.merge(keys).to_json, {"Content-Type" => "application/json", "Accept" => "application/json"}))
+      JSON.parse(@rest[path].post(opts.merge(keys).to_json,
+        {"Content-Type" => "application/json", "Accept" => "application/json"}))
+    end
+
+    def api_rest_timeout_seconds
+      60
+    end
+
+    def api_max_total_seconds
+      10 * 60
+    end
+
+    def api_sleep_before_retry_seconds
+      30
     end
 
     def retry_api(path, opts={})
-      Timeout.timeout(10 * 60) do
+      Timeout.timeout(api_max_total_seconds) do
         loop do
           if result = safe_api(path, opts)
             return result
           end
-          sleep 5
+          sleep api_sleep_before_retry_seconds
         end
       end
     rescue Timeout::Error

data/lib/ey_enzyme/cli.rb

@@ -134,7 +134,8 @@ module EY::Enzyme
     end
 
     def custom_cookbooks
-      @custom_cookbooks ||= CookbookSet.new(@opts, "custom", CUSTOM_RECIPE_PATH, @api.custom_recipe_url, @api)
+      url = @opts.has_key?(:custom_recipes_url) ? @opts[:custom_recipes_url] : @api.custom_recipe_url
+      @custom_cookbooks ||= CookbookSet.new(@opts, "custom", CUSTOM_RECIPE_PATH, url, @api)
     end
 
     def update_dna

data/lib/ey_enzyme/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Enzyme
-    VERSION = "0.9.40"
+    VERSION = "0.9.41"
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_enzyme
 version: !ruby/object:Gem::Version 
+  hash: 105
   prerelease: 
-  version: 0.9.40
+  segments: 
+  - 0
+  - 9
+  - 41
+  version: 0.9.41
 platform: ruby
 authors: 
 - Engine Yard Inc.
@@ -10,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -04:00
-default_executable: 
+date: 2010-02-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -21,6 +25,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +39,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id002
@@ -43,6 +55,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 123
+        segments: 
+        - 0
+        - 6
+        - 0
+        - 2
         version: 0.6.0.2
   type: :runtime
   version_requirements: *id003
@@ -54,6 +72,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 2
+        - 5
         version: 0.2.5
   type: :runtime
   version_requirements: *id004
@@ -65,6 +88,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 2
+        - 5
         version: 0.2.5
   type: :runtime
   version_requirements: *id005
@@ -76,6 +104,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,6 +118,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
   type: :development
   version_requirements: *id007
@@ -98,6 +133,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -109,6 +147,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -129,14 +170,13 @@ files:
 - lib/ey_enzyme/old_cli.rb
 - lib/ey_enzyme/version.rb
 - lib/ey_enzyme.rb
+- bin/ey-enzyme
+- bin/ey-recipes
 - spec/api_spec.rb
 - spec/log_upload_error_notify_spec.rb
 - spec/logging_spec.rb
 - spec/retry_report_and_notify_success_spec.rb
 - spec/spec_helper.rb
-- bin/ey-enzyme
-- bin/ey-recipes
-has_rdoc: true
 homepage: http://github.com/engineyard/ey_enzyme
 licenses: []
 
@@ -150,17 +190,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Gem for kicking off chef recipes