pocketknife 0.1.0 → 0.2.0

data/pocketknife.gemspec

@@ -4,21 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pocketknife}
-  s.version = "0.1.0"
+  s.name = "pocketknife"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igal Koshevoy"]
-  s.date = %q{2011-05-17}
-  s.description = %q{pocketknife is a devops tool for managing computers running chef-solo, powered by Opscode Chef.
-
-Using pocketknife, you create a project that describes the configuration of your computers and then deploy it to bring them to their intended state.
-
-With pocketknife, you don't need to setup or manage a specialized chef-server node or rely on an unreliable network connection to a distant hosted service whose security you don't control, deal with managing chef's security keys, or deal with manually synchronizing data with the chef-server datastore.
-
-With pocketknife, all of your cookbooks, roles and nodes are stored in easy-to-use files that you can edit, share, backup and version control with tools you already have.
-}
-  s.email = %q{igal+pocketknife@pragmaticraft.com}
+  s.date = "2012-06-18"
+  s.description = "pocketknife is a devops tool for managing computers running chef-solo, powered by Opscode Chef.\n\nUsing pocketknife, you create a project that describes the configuration of your computers and then deploy it to bring them to their intended state.\n\nWith pocketknife, you don't need to setup or manage a specialized chef-server node or rely on an unreliable network connection to a distant hosted service whose security you don't control, deal with managing chef's security keys, or deal with manually synchronizing data with the chef-server datastore.\n\nWith pocketknife, all of your cookbooks, roles and nodes are stored in easy-to-use files that you can edit, share, backup and version control with tools you already have.\n"
+  s.email = "igal+pocketknife@pragmaticraft.com"
   s.executables = ["pocketknife", "pocketknife"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -26,9 +19,10 @@ With pocketknife, all of your cookbooks, roles and nodes are stored in easy-to-u
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     ".yardopts",
+    "CHANGES.md",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -38,6 +32,7 @@ With pocketknife, all of your cookbooks, roles and nodes are stored in easy-to-u
     "lib/pocketknife/node.rb",
     "lib/pocketknife/node_manager.rb",
     "lib/pocketknife/version.rb",
+    "lib/shellwords.rb",
     "pocketknife.gemspec",
     "spec/pocketknife_execution_error_spec.rb",
     "spec/pocketknife_node_manager_spec.rb",
@@ -45,46 +40,58 @@ With pocketknife, all of your cookbooks, roles and nodes are stored in easy-to-u
     "spec/pocketknife_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/libraries.rb",
-    "spec/support/mkproject.rb"
+    "spec/support/mkproject.rb",
+    "spec/support/silence_stream.rb"
   ]
-  s.homepage = %q{http://github.com/igal/pocketknife}
+  s.homepage = "http://github.com/igal/pocketknife"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{pocketknife is a devops tool for managing computers running chef-solo, powered by Opscode Chef.}
+  s.rubygems_version = "1.8.11"
+  s.summary = "pocketknife is a devops tool for managing computers running chef-solo, powered by Opscode Chef."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<archive-tar-minitar>, ["~> 0.5.0"])
       s.add_runtime_dependency(%q<rye>, ["~> 0.9.0"])
-      s.add_development_dependency(%q<bluecloth>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<bluecloth>, ["~> 2.2.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<debugger-ruby_core_source>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
     else
       s.add_dependency(%q<archive-tar-minitar>, ["~> 0.5.0"])
       s.add_dependency(%q<rye>, ["~> 0.9.0"])
-      s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<bluecloth>, ["~> 2.2.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_dependency(%q<yard>, ["~> 0.8.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<debugger-ruby_core_source>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
     s.add_dependency(%q<archive-tar-minitar>, ["~> 0.5.0"])
     s.add_dependency(%q<rye>, ["~> 0.9.0"])
-    s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<bluecloth>, ["~> 2.2.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+    s.add_dependency(%q<yard>, ["~> 0.8.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<debugger-ruby_core_source>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
   end
 end
 

data/spec/pocketknife_node_spec.rb

@@ -1,9 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "PocketKnife::Node" do
-  def node_factory(name=nil, pocketknife=nil, connection=nil)
-    name ||= "mynode"
-    pocketknife ||= Pocketknife.new(:verbosity => false)
+  def node_factory(opts={})
+    connection = opts.delete(:connection)
+    name = opts.delete(:name) || "mynode"
+    pocketknife = opts.delete(:pocketknife) || Pocketknife.new(opts)
+    pocketknife.verbosity = false
+
     node = Pocketknife::Node.new(name, pocketknife)
     node.stub(:connection => connection || true) unless connection == false
     return node
@@ -13,7 +16,7 @@ describe "PocketKnife::Node" do
     before do
       @pocketknife = Pocketknife.new
       @name = "mynode"
-      @node = node_factory(@name, @pocketknife)
+      @node = node_factory(:name => @name, :pocketknife => @pocketknife)
     end
 
     it "should have a name" do
@@ -27,7 +30,7 @@ describe "PocketKnife::Node" do
 
   describe "#connection" do
     it "should instantiate a new connection" do
-      node = node_factory(nil, nil, false)
+      node = node_factory(:connection => false)
       rye = mock(Rye::Box)
       rye.should_receive(:disable_safe_mode)
       Rye::Box.should_receive(:new).with("mynode", {:user => "root"}).and_return(rye)
@@ -36,7 +39,7 @@ describe "PocketKnife::Node" do
     end
 
     it "should return an existing connection" do
-      node = node_factory(nil, nil, false)
+      node = node_factory(:connection => false)
       rye = mock(Rye::Box)
       rye.should_receive(:disable_safe_mode)
       Rye::Box.should_receive(:new).with("mynode", {:user => "root"}).and_return(rye)
@@ -52,13 +55,13 @@ describe "PocketKnife::Node" do
     end
 
     it "should find an existing executable" do
-      @node.connection.should_receive(:execute).with(%{which "chef-solo" && test -x `which "chef-solo"`}).and_return(true)
+      @node.connection.should_receive(:execute).with(%{which chef-solo && test -x `which chef-solo`}).and_return(true)
 
       @node.has_executable?("chef-solo").should be_true
     end
 
     it "should not find a missing executable" do
-      @node.connection.should_receive(:execute).with(%{which "chef-solo" && test -x `which "chef-solo"`}).and_raise(Rye::Err.new("omg"))
+      @node.connection.should_receive(:execute).with(%{which chef-solo && test -x `which chef-solo`}).and_raise(Rye::Err.new("omg"))
 
       @node.has_executable?("chef-solo").should be_false
     end
@@ -250,17 +253,17 @@ cd /root &&
   end
 
   describe "#upload" do
-    it "should upload configuration" do
+    it "should upload configuration with tar" do
       mkproject do
-        node = node_factory
+        node = node_factory :transfer_mechanism => :tar
 
         local_node_json = node.local_node_json_pathname
         local_node_json.open("w") { |h| h.write("{}") }
 
         node.should_receive(:execute).with(<<-HERE)
 umask 0377 &&
-  rm -rf "/etc/chef" "/var/local/pocketknife" "/var/local/pocketknife/cache" "/usr/local/sbin/chef-solo-apply" "/usr/local/sbin/csa" &&
-  mkdir -p "/etc/chef" "/var/local/pocketknife" "/var/local/pocketknife/cache" "/usr/local/sbin"
+  rm -rf /etc/chef /var/local/pocketknife /var/local/pocketknife/cache /usr/local/sbin/chef-solo-apply /usr/local/sbin/csa &&
+  mkdir -p /etc/chef /var/local/pocketknife /var/local/pocketknife/cache /usr/local/sbin
         HERE
 
         node.connection.should_receive(:file_upload).with(local_node_json.to_s, "/etc/chef/node.json")
@@ -268,16 +271,48 @@ umask 0377 &&
         node.connection.should_receive(:file_upload).with(Pocketknife::Node::TMP_TARBALL.to_s, "/var/local/pocketknife/cache/pocketknife.tmp")
 
         node.should_receive(:execute).with(<<-HERE, true)
-cd "/var/local/pocketknife/cache" &&
-  tar xf "/var/local/pocketknife/cache/pocketknife.tmp" &&
+cd /var/local/pocketknife/cache &&
+  tar xf /var/local/pocketknife/cache/pocketknife.tmp &&
   chmod -R u+rwX,go= . &&
   chown -R root:root . &&
-  mv "solo.rb.tmp" "/etc/chef/solo.rb" &&
-  mv "chef-solo-apply.tmp" "/usr/local/sbin/chef-solo-apply" &&
-  chmod u+x "/usr/local/sbin/chef-solo-apply" &&
-  ln -s "chef-solo-apply" "/usr/local/sbin/csa" &&
-  rm "/var/local/pocketknife/cache/pocketknife.tmp" &&
-  mv * "/var/local/pocketknife"
+  mv solo.rb.tmp /etc/chef/solo.rb &&
+  mv chef-solo-apply.tmp /usr/local/sbin/chef-solo-apply &&
+  chmod u+x /usr/local/sbin/chef-solo-apply &&
+  ln -s chef-solo-apply /usr/local/sbin/csa &&
+  rm /var/local/pocketknife/cache/pocketknife.tmp &&
+  mv * /var/local/pocketknife
+        HERE
+
+        node.upload
+      end
+    end
+
+    it "should upload configuration with rsync" do
+      mkproject do
+        node = node_factory :transfer_mechanism => :rsync
+
+        local_node_json = node.local_node_json_pathname
+        local_node_json.open("w") { |h| h.write("{}") }
+
+        node.should_receive(:execute).with(<<-HERE)
+umask 0377 &&
+  rm -rf /etc/chef /var/local/pocketknife /var/local/pocketknife/cache /usr/local/sbin/chef-solo-apply /usr/local/sbin/csa &&
+  mkdir -p /etc/chef /var/local/pocketknife /var/local/pocketknife/cache /usr/local/sbin
+        HERE
+
+        base = "root@#{node.name}:"
+        k = Pocketknife::Node
+        node.should_receive(:rsync_file).with(local_node_json.to_s, "#{base}#{k::NODE_JSON}")
+        node.should_receive(:rsync_file).with("#{k::TMP_SOLO_RB}", "#{base}#{k::SOLO_RB}")
+        node.should_receive(:rsync_file).with("#{k::TMP_CHEF_SOLO_APPLY}", "#{base}#{k::CHEF_SOLO_APPLY}")
+        node.should_receive(:rsync_directory).with("#{k::VAR_POCKETKNIFE_COOKBOOKS.basename}/", "#{base}#{k::VAR_POCKETKNIFE_COOKBOOKS}")
+        node.should_receive(:rsync_directory).with("#{k::VAR_POCKETKNIFE_SITE_COOKBOOKS.basename}/", "#{base}#{k::VAR_POCKETKNIFE_SITE_COOKBOOKS}")
+        node.should_receive(:rsync_directory).with("#{k::VAR_POCKETKNIFE_ROLES.basename}/", "#{base}#{k::VAR_POCKETKNIFE_ROLES}")
+
+        node.should_receive(:execute).with(<<-HERE, true)
+cd /var/local/pocketknife/cache &&
+  chmod u+x /usr/local/sbin/chef-solo-apply &&
+  ln -s chef-solo-apply /usr/local/sbin/csa
         HERE
 
         node.upload
@@ -295,5 +330,14 @@ cd "/var/local/pocketknife/cache" &&
 
       node.apply
     end
+
+    it "should apply configuration with overridden runlist" do
+      node = node_factory :runlist => "myrunlist"
+      node.should_receive(:install)
+      node.should_receive(:execute).with("chef-solo -j /etc/chef/node.json -o myrunlist", true)
+      node.stub(:say)
+
+      node.apply
+    end
   end
 end

data/spec/pocketknife_spec.rb

@@ -32,7 +32,11 @@ describe "Pocketknife" do
       describe "without name" do
         it "should raise an exception and not create anything" do
           mktmpdircd do |dir|
-            lambda { Pocketknife.cli(['-c', '-q']) }.should raise_error(Errno::ENOENT)
+            lambda {
+              silence_stream(STDOUT) {
+                Pocketknife.cli(['-c', '-q'])
+              }
+            }.should raise_error(SystemExit)
             Dir["#{Dir.pwd}/*"].should be_empty
           end
         end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+if ENV['SIMPLECOV']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
@@ -8,5 +15,5 @@ require 'pocketknife'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

data/spec/support/silence_stream.rb

@@ -0,0 +1,11 @@
+# Silences any stream for the duration of the block.
+#
+# File activesupport/lib/active_support/core_ext/kernel/reporting.rb, line 39
+def silence_stream(stream)
+  old_stream = stream.dup
+  stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+  stream.sync = true
+  yield
+ensure
+  stream.reopen(old_stream)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pocketknife
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Igal Koshevoy
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -07:00
-default_executable: 
+date: 2012-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -30,10 +29,10 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  requirement: *id001
+  name: archive-tar-minitar
   prerelease: false
   type: :runtime
-  name: archive-tar-minitar
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,90 +45,88 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  requirement: *id002
+  name: rye
   prerelease: false
   type: :runtime
-  name: rye
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 2
-        - 1
         - 0
-        version: 2.1.0
-  requirement: *id003
+        version: "0"
+  name: rake
   prerelease: false
   type: :development
-  name: bluecloth
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 2
-        - 3
+        - 2
         - 0
-        version: 2.3.0
-  requirement: *id004
+        version: 2.2.0
+  name: bluecloth
   prerelease: false
   type: :development
-  name: rspec
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 39
         segments: 
+        - 2
+        - 10
         - 0
-        - 6
-        - 0
-        version: 0.6.0
-  requirement: *id005
+        version: 2.10.0
+  name: rspec
   prerelease: false
   type: :development
-  name: yard
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 63
         segments: 
-        - 1
         - 0
+        - 8
         - 0
-        version: 1.0.0
-  requirement: *id006
+        version: 0.8.0
+  name: yard
   prerelease: false
   type: :development
-  name: bundler
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 55
         segments: 
         - 1
-        - 6
+        - 8
         - 0
-        version: 1.6.0
-  requirement: *id007
+        version: 1.8.0
+  name: jeweler
   prerelease: false
   type: :development
-  name: jeweler
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -140,10 +137,66 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rcov
+  prerelease: false
+  type: :development
   requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: ruby-debug
   prerelease: false
   type: :development
-  name: rcov
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: simplecov
+  prerelease: false
+  type: :development
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: debugger-ruby_core_source
+  prerelease: false
+  type: :development
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: debugger
+  prerelease: false
+  type: :development
+  requirement: *id012
 description: |
   pocketknife is a devops tool for managing computers running chef-solo, powered by Opscode Chef.
   
@@ -156,7 +209,6 @@ description: |
 email: igal+pocketknife@pragmaticraft.com
 executables: 
 - pocketknife
-- pocketknife
 extensions: []
 
 extra_rdoc_files: 
@@ -164,9 +216,10 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- .travis.yml
 - .yardopts
+- CHANGES.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -176,6 +229,7 @@ files:
 - lib/pocketknife/node.rb
 - lib/pocketknife/node_manager.rb
 - lib/pocketknife/version.rb
+- lib/shellwords.rb
 - pocketknife.gemspec
 - spec/pocketknife_execution_error_spec.rb
 - spec/pocketknife_node_manager_spec.rb
@@ -184,7 +238,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/libraries.rb
 - spec/support/mkproject.rb
-has_rdoc: true
+- spec/support/silence_stream.rb
 homepage: http://github.com/igal/pocketknife
 licenses: 
 - MIT
@@ -214,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: pocketknife is a devops tool for managing computers running chef-solo, powered by Opscode Chef.