butcher 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7
+  - ree
+script: "bundle exec rspec spec && bundle exec cucumber features"
+notifications:
+  email:
+    recipients:
+      - e.saxby@modcloth.com
+      - github@modcloth.com
+    on_success: never
+    on_failure: always

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in butcher.gemspec
+gem "aruba-doubles", :git => "https://github.com/sax/aruba-doubles.git"
 gemspec

data/README.md

@@ -3,6 +3,16 @@
 Butcher is a set of command line tools intended to ease the use of Chef with a managed
 Opscode account.
 
+### Installation
+
+        gem install "butcher"
+
+Or stick this in your Gemfile
+
+       gem "butcher"
+       #  or
+       gem "butcher", "~>0.0.1"
+
 ## Commands
 
 The following commands are currently available. All commands should be run from the top
@@ -39,6 +49,11 @@ 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/features/step_definitions/chef_steps.rb

@@ -1,11 +1,11 @@
 Given /I (don't|) ?have a knife configuration file/ do |expectation|
   if expectation == "don't"
-    steps %q{
-      When I remove the file ".chef/knife.rb"
+    steps %Q{
+      When I remove the file "#{ENV["PWD"]}/.chef/knife.rb"
     }
   else
-    steps %q{
-      Given a file named ".chef/knife.rb" with:
+    steps %Q{
+      Given a file named "#{ENV["PWD"]}/.chef/knife.rb" with:
       """
       chef_server_url "https://opscode.url/organizations/my_organization"
       """
@@ -14,8 +14,8 @@ Given /I (don't|) ?have a knife configuration file/ do |expectation|
 end
 
 Given /I have an invalid knife configuration file/ do
-  steps %q{
-    Given a file named ".chef/knife.rb" with:
+  steps %Q{
+    Given a file named "#{ENV["PWD"]}/.chef/knife.rb" with:
     """
     some invalid content
     """

data/features/support/aruba.rb

@@ -1,3 +1,4 @@
 Before do
   @dirs = ["."]
+  set_env("PWD", "#{Butcher::TestCache::PWD}/tmp")
 end

data/lib/butcher/cache.rb

@@ -27,7 +27,7 @@ class Butcher::Cache
 
   def self.format_nodes_for_stderr(nodes)
     nodes.map do |key, value|
-      %Q{#{value} => #{key}}
+      %Q{#{value.inspect} => #{key}}
     end.sort.join("\n")
   end
 
@@ -38,14 +38,18 @@ class Butcher::Cache
   private
 
   def organization
-    raise Butcher::NoKnifeRB unless(File.exists?(KNIFE_FILE))
-    if m = File.read(KNIFE_FILE).match(/chef_server_url\s+".+organizations\/([^\/"]+)"/)
+    raise Butcher::NoKnifeRB unless(File.exists?(knife_file))
+    if m = File.read(knife_file).match(/chef_server_url\s+".+organizations\/([^\/"]+)"/)
       m[1]
     else
       raise Butcher::NoKnifeOrganization
     end
   end
 
+  def knife_file
+    File.expand_path(KNIFE_FILE, ENV["PWD"])
+  end
+
   def create_node_cachefile
     File.open(nodes_file, "w") do |file|
       file.puts %x[knife status]

data/lib/butcher/stab/cli.rb

@@ -19,10 +19,6 @@ class Butcher::Stab::CLI
   end
 
   def matching_node
-    nodes = Butcher::Cache.instance.nodes(options).select do |k, v|
-      String(v).include? self.node_matcher
-    end
-
     raise(Butcher::UnmatchedNode) if nodes.size == 0
     raise(Butcher::AmbiguousNode, Butcher::Cache.format_nodes_for_stderr(nodes)) if nodes.size > 1
     nodes.keys.first
@@ -33,4 +29,10 @@ class Butcher::Stab::CLI
       " -l #{options[:login]}"
     end
   end
-end
+
+  def nodes
+    @nodes ||= Butcher::Cache.instance.nodes(options).reject do |k, v|
+      ! String(v).include? self.node_matcher
+    end
+  end
+end

data/lib/butcher/version.rb

@@ -1,3 +1,3 @@
 module Butcher
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/cache_spec.rb

@@ -2,20 +2,21 @@ require 'spec_helper'
 
 describe Butcher::Cache, "initialization" do
   ## singletons do not reset after initialization, so we run tests against clones
-  let(:cache_class) { Butcher::Cache.clone }
 
+  class CacheSingletonForEnv < Butcher::Cache; end
   it "should accept cache_dir from env" do
     ENV["CACHE_DIR"] = "tmp/cache_from_options"
     test(?d, "tmp/cache_from_options").should be_false
-    cache_class.instance
+    CacheSingletonForEnv.instance
     ENV["CACHE_DIR"] = nil
     test(?d, "tmp/cache_from_options").should be_true
   end
 
+  class CacheSingleton < Butcher::Cache; end
   it "should create cache directory" do
-    cache_class.any_instance.stubs(:cache_dir).returns("tmp/cache_stub")
+    CacheSingleton.any_instance.stubs(:cache_dir).returns("tmp/cache_stub")
     test(?d, "tmp/cache_stub").should be_false
-    cache_class.instance
+    CacheSingleton.instance
     test(?d, "tmp/cache_stub").should be_true
   end
 end
@@ -23,7 +24,7 @@ end
 describe Butcher::Cache, "#nodes_file" do
   context "cannot find knife.rb" do
     it "should raise an error" do
-      File.expects(:exists?).with(".chef/knife.rb").returns(false)
+      File.expects(:exists?).with("#{ENV["PWD"]}/.chef/knife.rb").returns(false)
       lambda {
         Butcher::Cache.instance.nodes_file
       }.should raise_error(Butcher::NoKnifeRB)
@@ -31,11 +32,11 @@ describe Butcher::Cache, "#nodes_file" do
   end
 
   context "sees a knife.rb" do
-    before { File.expects(:exists?).with(".chef/knife.rb").returns(true) }
+    before { File.expects(:exists?).with("#{ENV["PWD"]}/.chef/knife.rb").returns(true) }
 
     context "without chef_server_url" do
       it "should raise an error" do
-        File.expects(:read).with(".chef/knife.rb").returns(
+        File.expects(:read).with("#{ENV["PWD"]}/.chef/knife.rb").returns(
           'some random content'
         )
         lambda {
@@ -48,7 +49,7 @@ describe Butcher::Cache, "#nodes_file" do
       let(:expected_file) { "#{Butcher::TestCache.cache_dir}/my_organization.cache" }
 
       it "should set filename based on chef_server_url" do
-        File.expects(:read).with(".chef/knife.rb").returns(
+        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
@@ -58,11 +59,10 @@ describe Butcher::Cache, "#nodes_file" do
 end
 
 describe Butcher::Cache, "#nodes" do
-  before { Butcher::Cache.any_instance.stubs(:organization).returns("ops_org") }
+  let(:cache_file) { "#{Butcher::TestCache.cache_dir}/ops_org.cache" }
+  before { Butcher::Cache.any_instance.stubs(:nodes_file).returns(cache_file) }
 
   context "cache file does not exist" do
-    let(:cache_file) { "#{Butcher::TestCache.cache_dir}/ops_org.cache" }
-
     before do
       File.exists?(cache_file).should be_false
       Butcher::Cache.any_instance.stubs(:`).with("knife status").returns("knife return codes")

data/spec/support/test_cache.rb

@@ -20,6 +20,8 @@
 #    World(Butcher::TestCache::TestHelpers)
 #
 module Butcher::TestCache
+  PWD = ENV["PWD"]
+
   def self.setup_rspec(config)
     config.before(:each) do
       Butcher::TestCache.reset
@@ -40,8 +42,8 @@ module Butcher::TestCache
 
   def self.cleanup # :nodoc:
     FileUtils.rm_rf("tmp")
-    FileUtils.rm_rf(".chef")
     ENV.delete("CACHE_DIR")
+    ENV["PWD"] = PWD
   end
 
   def self.cache_dir # :nodoc:
@@ -51,6 +53,7 @@ module Butcher::TestCache
   private
 
   def self.setup
+    ENV["PWD"] = "#{PWD}/tmp"
     stub_cache
     FileUtils.mkdir_p("tmp/test")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: butcher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346417175740 !ruby/object:Gem::Requirement
+  requirement: &70173155128740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -22,10 +22,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70346417175740
+  version_requirements: *70173155128740
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70346417175140 !ruby/object:Gem::Requirement
+  requirement: &70173155128120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346417175140
+  version_requirements: *70173155128120
 - !ruby/object:Gem::Dependency
   name: aruba-doubles
-  requirement: &70346417174680 !ruby/object:Gem::Requirement
+  requirement: &70173155127520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346417174680
+  version_requirements: *70173155127520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70346417174260 !ruby/object:Gem::Requirement
+  requirement: &70173155126960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346417174260
+  version_requirements: *70173155126960
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70346417173820 !ruby/object:Gem::Requirement
+  requirement: &70173155126360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346417173820
+  version_requirements: *70173155126360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70346417173380 !ruby/object:Gem::Requirement
+  requirement: &70173155125600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346417173380
+  version_requirements: *70173155125600
 description: Chef is a tool for managing server automation. A good butcher makes for
   a good chef.
 email:
@@ -90,6 +90,7 @@ files:
 - .gitignore
 - .rbenv-version
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.md