ey_enzyme 0.9.44.c21 → 0.9.44.pre

data/lib/ey_enzyme/multi_logger.rb

@@ -1,19 +1,9 @@
-require 'logglier'
-
 module EY::Enzyme
   class MultiLogger
 
-    def self.loggly_url
-      'https://logs.engineyard.loggly.com/inputs/7d877a85-c36a-4e60-a6ba-1d55185e2b91'
-    end
-
     def initialize(log_file)
       @enzyme_log = Logger.new(log_file)
       @stderr_log = Logger.new($stderr)
-      begin
-      @loggly_log = Logglier.new(self.class.loggly_url, :verify_mode => OpenSSL::SSL::VERIFY_NONE)
-      rescue
-      end
     end
 
     def debug(message)
@@ -37,10 +27,6 @@ module EY::Enzyme
     def log(level, message)
       @stderr_log.send(level, message)
       @enzyme_log.send(level, message)
-      begin
-      @loggly_log.send(level, message) if @loggly_log
-      rescue
-      end
     end
   end
 end

data/lib/ey_enzyme/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Enzyme
-    VERSION = "0.9.44.c21"
+    VERSION = "0.9.44.pre"
   end
 end

metadata

@@ -1,171 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ey_enzyme
-version: !ruby/object:Gem::Version 
-  hash: 427
+version: !ruby/object:Gem::Version
+  version: 0.9.44.pre
   prerelease: 7
-  segments: 
-  - 0
-  - 9
-  - 44
-  - c
-  - 21
-  version: 0.9.44.c21
 platform: ruby
-authors: 
+authors:
 - Engine Yard Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-02-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70297366943200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70297366943200
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70297366942680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: chef
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70297366942680
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &70297366942200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: -3806225206
-        segments: 
-        - 0
-        - 10
-        - 8
-        - patch
-        - 3
-        version: 0.10.8.patch3
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.6.0.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: chef-deploy
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70297366942200
+- !ruby/object:Gem::Dependency
+  name: chef-deploy
+  requirement: &70297366941720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 2
-        - 5
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.2.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  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 
+  version_requirements: *70297366941720
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70297366941240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70297366941240
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70297366940760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70297366940760
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70297366940280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: fakeweb-matcher
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70297366940280
+- !ruby/object:Gem::Dependency
+  name: fakeweb-matcher
+  requirement: &70297366939800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *70297366939800
 description: Gem for kicking off chef recipes
 email: ninja@engineyard.com
-executables: 
+executables:
 - ey-enzyme
 - ey-recipes
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ey_enzyme/api.rb
 - lib/ey_enzyme/cli.rb
 - lib/ey_enzyme/cookbook_set.rb
@@ -175,49 +116,28 @@ 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Gem for kicking off chef recipes
-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
+test_files: []

data/spec/api_spec.rb

@@ -1,44 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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
-
-  it "it should have a loggly_url" do
-    EY::Enzyme::MultiLogger.loggly_url.should_not == nil
-    EY::Enzyme::MultiLogger.loggly_url.should == 'https://logs.engineyard.loggly.com/inputs/7d877a85-c36a-4e60-a6ba-1d55185e2b91'
-  end
-
-  it "it should log something to loggly" do
-    FakeWeb.register_uri(:post, EY::Enzyme::MultiLogger.loggly_url, :body => {}.to_json)
-    logger = EY::Enzyme::MultiLogger.new($stdout)
-    logger.debug("test")
-    FakeWeb.should have_requested(:post, EY::Enzyme::MultiLogger.loggly_url)
-  end
-end

data/spec/retry_report_and_notify_success_spec.rb

@@ -1,62 +0,0 @@
-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

@@ -1,9 +0,0 @@
-$:.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}/*")