butcher 0.0.3 → 0.0.4

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p125
+1.9.3-p194

data/README.md

@@ -1,5 +1,7 @@
 # Butcher
 
+[![Build status](https://secure.travis-ci.org/livinginthepast/butcher.png)](http://travis-ci.org/livinginthepast/butcher)
+
 Butcher is a set of command line tools intended to ease the use of Chef with a managed
 Opscode account.
 
@@ -49,11 +51,6 @@ by looking at the chef_server_url in your knife.rb. For this reason, stab can on
 from the top level of a chef repo.
 
 
-## Build Status
-
-[![Build status](https://secure.travis-ci.org/modcloth/butcher.png)](http://travis-ci.org/modcloth/butcher)
-
-
 ## License
 
 Copyright 2012 ModCloth

data/butcher.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", "> 2"
   s.add_development_dependency "aruba"
-  s.add_development_dependency "aruba-doubles", "~>0.2.3"
+  s.add_development_dependency "aruba-doubles"
+  s.add_development_dependency "rb-fsevent", '~> 0.9.1'
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "guard-cucumber"
   s.add_development_dependency "mocha"
   # s.add_runtime_dependency "x"
+  s.add_runtime_dependency "chef", "~> 10.14"
 end

data/features/stab.feature

@@ -1,13 +1,12 @@
 Feature: Stab
 
   Background:
-    # stubbing knife currently doesn't work, but tests pass anyways
-    #Given I could run `knife status` with stdout:
-    #"""
-    #1 minute ago, app.node, app.domain, 1.1.1.1, os
-    #"""
+    Given I double `knife status` with stdout:
+    """
+    1 minute ago, app.node, app.domain, 1.1.1.1, os
+    """
     Given I have a knife configuration file
-    And I could run `ssh 1.1.1.1` with stdout:
+    And I double `ssh 1.1.1.1` with stdout:
     """
     ssh yay!
     """
@@ -61,7 +60,8 @@ Feature: Stab
       | 1 minute ago | app.node | app.domain | 1.1.1.1 | os |
     When I run `stab app.node -c tmp/test -f -v`
     Then the output should contain "Creating cache file of nodes"
-    #And the exit status should be 0      ## Butcher::Cache does not use stubbed knife
+    And the double `knife status` should have been run
+    And the exit status should be 0
 
   Scenario: User sees error message if no node matches given name
     Given I have the following chef nodes:
@@ -89,7 +89,7 @@ Feature: Stab
   Scenario: User can connect to server with given user name
     Given I have the following chef nodes:
       | 1 minute ago | app.node | app.domain | 1.1.1.1 | os |
-    Given I could run `ssh 1.1.1.1 -l user` with stdout:
+    Given I double `ssh 1.1.1.1 -l user` with stdout:
     """
     user: I'm a computer!
     """

data/features/step_definitions/chef_steps.rb

@@ -8,6 +8,8 @@ Given /I (don't|) ?have a knife configuration file/ do |expectation|
       Given a file named "#{ENV["PWD"]}/.chef/knife.rb" with:
       """
       chef_server_url "https://opscode.url/organizations/my_organization"
+      validation_key  "my_organization.pem"
+      validation_client_name "my_organization-validator"
       """
     }
   end

data/lib/butcher/cache.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'chef/config'
 
 class Butcher::Cache
   include Singleton
@@ -39,7 +40,8 @@ class Butcher::Cache
 
   def organization
     raise Butcher::NoKnifeRB unless(File.exists?(knife_file))
-    if m = File.read(knife_file).match(/chef_server_url\s+".+organizations\/([^\/"]+)"/)
+    Chef::Config.from_file(knife_file)
+    if m = Chef::Config[:chef_server_url].match(%r[.+/organizations\/([^\/"]+)])
       m[1]
     else
       raise Butcher::NoKnifeOrganization
@@ -51,8 +53,10 @@ class Butcher::Cache
   end
 
   def create_node_cachefile
-    File.open(nodes_file, "w") do |file|
-      file.puts %x[knife status]
+    with_safe_paths do
+      File.open(nodes_file, "w") do |file|
+        file.puts %x[knife status]
+      end
     end
   end
 
@@ -66,4 +70,15 @@ class Butcher::Cache
       block.call f
     end
   end
+
+  # RVM rewrites paths to ensure that it is first. This makes it impossible
+  # to use aruba in cucumber with any gem executables.
+  def with_safe_paths
+    original_path = (ENV["PATH"] || '').split(::File::PATH_SEPARATOR)
+    aruba_path = original_path.select { |x| x =~ /\/tmp\/d\d{8}-\d+-.+/}
+    ENV['PATH'] = (aruba_path | original_path).join(::File::PATH_SEPARATOR)
+    yield
+  ensure
+    ENV["PATH"] = original_path.join(::File::PATH_SEPARATOR)
+  end
 end

data/lib/butcher/version.rb

@@ -1,3 +1,3 @@
 module Butcher
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/cache_spec.rb

@@ -32,13 +32,17 @@ describe Butcher::Cache, "#nodes_file" do
   end
 
   context "sees a knife.rb" do
-    before { File.expects(:exists?).with("#{ENV["PWD"]}/.chef/knife.rb").returns(true) }
+    before {
+      File.expects(:exists?).with("#{ENV["PWD"]}/.chef/knife.rb").returns(true)
+      Chef::Config.expects(:from_file).with("#{ENV["PWD"]}/.chef/knife.rb").returns(true)
+    }
 
     context "without chef_server_url" do
+      before {
+        Chef::Config.expects(:[]).with(:chef_server_url).returns("random content")
+      }
+
       it "should raise an error" do
-        File.expects(:read).with("#{ENV["PWD"]}/.chef/knife.rb").returns(
-          'some random content'
-        )
         lambda {
           Butcher::Cache.instance.nodes_file
         }.should raise_error(Butcher::NoKnifeOrganization)
@@ -47,11 +51,11 @@ describe Butcher::Cache, "#nodes_file" do
 
     context "with chef_server_url" do
       let(:expected_file) { "#{Butcher::TestCache.cache_dir}/my_organization.cache" }
+      before {
+        Chef::Config.expects(:[]).with(:chef_server_url).returns("https://api.opscode.com/organizations/my_organization")
+      }
 
       it "should set filename based on chef_server_url" do
-        File.expects(:read).with("#{ENV["PWD"]}/.chef/knife.rb").returns(
-          'chef_server_url "https://api.opscode.com/organizations/my_organization"'
-        )
         Butcher::Cache.instance.nodes_file.should == expected_file
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: butcher
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70365541610940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -22,10 +22,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70365541610940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70365541610520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +38,47 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365541610520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba-doubles
-  requirement: &70365541609980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70365541609980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70365541609560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365541609560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70365541609100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365541609100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70365541608680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +118,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365541608680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.14'
 description: Chef is a tool for managing server automation. A good butcher makes for
   a good chef.
 email:
@@ -132,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: butcher
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: All the things to make a chef
@@ -147,3 +209,4 @@ test_files:
 - spec/lib/stab/cli_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_cache.rb
+has_rdoc: