ey_enzyme 0.9.44 → 0.9.45.ruby19

data/lib/ey_enzyme/api.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module EY::Enzyme
   class API
     def initialize(api_url, instance_id, token, log_file = "/var/log/enzyme.log")

data/lib/ey_enzyme/cookbook_set.rb

@@ -73,7 +73,7 @@ module EY::Enzyme
       Zlib::GzipWriter.open(file) { |io| io << File.read(@chef_log) }
 
       unless @api.upload(@name, File.read(file))
-        @logger.error "Failed to upload #{type} log. Reporting error"
+        @logger.error "Failed to upload #{@name} log. Reporting error"
         raise UploadError, "failed to upload #{@name} log"
       end
     rescue UploadError => error

data/lib/ey_enzyme/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Enzyme
-    VERSION = "0.9.44"
+    VERSION = "0.9.45.ruby19"
   end
 end

data/spec/api_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'stringio'
+
+describe "enzyme API" do
+  
+  before { FakeWeb.allow_net_connect = false }
+  after  { FakeWeb.allow_net_connect = true  }
+  
+  def new_api(*args)
+    old_stderr = $stderr
+    $stderr = StringIO.new
+    api = EY::Enzyme::API.new(*args)
+    $stderr = old_stderr
+    api
+  end
+  
+  context "with an EY::Enzyme::API" do
+    before do
+      @enzyme_api = new_api("https://cloud.engineyard.com/dracul", 
+        "i-d8babcb5", 
+        "8c40f5769f8987489ec66a3abc944123fc0f043c",
+        File.dirname(__FILE__) + '/../tmp/test.log')
+    end
+    
+    it "should be able to post errors" do      
+      FakeWeb.register_uri(
+        :post,
+        "https://cloud.engineyard.com/dracul/error",
+        :body => {}.to_json
+      )
+      
+      begin
+        raise "we fail"
+      rescue => e
+        #WE need to do this because the exception is expected to have a backtrace
+        @enzyme_api.notify_error("user", e)
+      end
+      
+      FakeWeb.should have_requested(:post, "https://cloud.engineyard.com/dracul/error")
+    end
+    
+  end
+  
+end

data/spec/log_upload_error_notify_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "EY::Enzyme::CookbookSet#upload" do
+  before do
+    FakeWeb.clean_registry
+    @api_url = "https://cloud.engineyard.example.com/dracul"
+
+    fake_cheflog_location = File.expand_path(File.dirname(__FILE__) + '/../tmp/clitestlog')
+    logfile_location = File.expand_path(File.dirname(__FILE__) + '/../tmp/clitestlog')
+    @cookbooks = EY::Enzyme::CLI.new(:logfile => logfile_location, :api => @api_url).main_cookbooks
+
+    #HAX: (might as well be a mock)
+    @cookbooks.instance_eval {
+      @chef_log = fake_cheflog_location
+    }
+  end
+
+  it "posts the log file to /store" do
+    FakeWeb.register_uri(
+      :post,
+      @api_url + "/store",
+      :body => {}.to_json
+    )
+    @cookbooks.upload
+  end
+
+  it "posts an error when attempt to upload logs returns 500" do
+    FakeWeb.register_uri(
+      :post,
+      @api_url + "/store",
+      :body => {}.to_json,
+      :status => ["500", "Internal Server Error"]
+    )
+    FakeWeb.register_uri(
+      :post,
+      @api_url + "/error",
+      :body => {}.to_json
+    )
+    @cookbooks.upload
+    posted = JSON.parse(FakeWeb.last_request.body.to_s)
+    posted["where_failed"].should == "logupload"
+    posted["message"].should == "failed to upload main log"
+  end
+
+end

data/spec/logging_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe EY::Enzyme::MultiLogger do
+
+  before do
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+  end
+end

data/spec/retry_report_and_notify_success_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "EY::Enzyme::API" do
+  before do
+    FakeWeb.clean_registry
+    @api_url = "https://cloud.engineyard.example.com/dracul"
+
+    logfile_location = File.expand_path(File.dirname(__FILE__) + '/../tmp/clitestlog')
+    @cli = EY::Enzyme::CLI.new(:logfile => logfile_location, :api => @api_url)
+    @api = @cli.instance_eval{ @api }
+  end
+
+  describe "notify_success" do
+    it "can notify success" do
+      FakeWeb.register_uri(
+        :post,
+        @api_url + "/completed",
+        :body => {}.to_json
+      )
+      @api.notify_success
+    end
+
+    it "retries on 502" do
+      FakeWeb.register_uri(
+        :post,
+        @api_url + "/completed",
+        [
+          {:body => {}.to_json, :status => ["502", "Bad Gateway"]},
+          {:body => {}.to_json, :status => ["200", "Success"]},
+        ]
+      )
+      lambda{ @api.notify_success }.should_not raise_error
+    end
+  end
+
+  describe "report" do
+    it "can report chef statuses" do
+      FakeWeb.register_uri(
+        :post,
+        @api_url + "/report",
+        :body => {}.to_json
+      )
+      @api.report 'report some status'
+
+      posted = JSON.parse(FakeWeb.last_request.body.to_s)
+      posted["message"].should == "report some status"
+    end
+
+    it "doesn't raise or retry on 502" do
+      FakeWeb.register_uri(
+        :post,
+        @api_url + "/report",
+        [
+          {:body => {}.to_json, :status => ["502", "Bad Gateway"]},
+          {:body => lambda{ raise "no!" }}, #bad bad hax, doesn't work the way you would hope
+        ]
+      )
+      lambda{ @api.report 'some status update' }.should_not raise_error
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'ey_enzyme'
+require 'fakeweb'
+require 'fakeweb_matcher'
+
+tmpdir = File.expand_path(File.dirname(__FILE__) + '/../tmp')
+FileUtils.mkdir_p tmpdir
+FileUtils.rm Dir.glob("#{tmpdir}/*")

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ey_enzyme
 version: !ruby/object:Gem::Version 
-  hash: 99
-  prerelease: 
+  hash: -483342322
+  prerelease: 7
   segments: 
   - 0
   - 9
-  - 44
-  version: 0.9.44
+  - 45
+  - ruby
+  - 19
+  version: 0.9.45.ruby19
 platform: ruby
 authors: 
 - Engine Yard Inc.
@@ -53,15 +55,16 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 123
+        hash: -3806225206
         segments: 
         - 0
-        - 6
-        - 0
-        - 2
-        version: 0.6.0.2
+        - 10
+        - 8
+        - patch
+        - 3
+        version: 0.10.8.patch3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -81,9 +84,25 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: logglier
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 2
+        - 5
+        version: 0.2.5
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +112,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -108,11 +127,11 @@ dependencies:
         - 2
         version: "1.2"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,11 +141,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,7 +155,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: Gem for kicking off chef recipes
 email: ninja@engineyard.com
 executables: 
@@ -156,6 +175,11 @@ files:
 - 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
 homepage: http://github.com/engineyard/ey_enzyme
 licenses: []
 
@@ -176,18 +200,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Gem for kicking off chef recipes
-test_files: []
-
+test_files: 
+- 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