microwave 1.0.2 → 1.0.3

data/Rakefile

@@ -17,16 +17,16 @@
 # limitations under the License.
 #
 
-require File.dirname(__FILE__) + '/lib/chef/version'
+#require File.dirname(__FILE__) + '/lib/chef/version'
 
 require 'rubygems'
 require 'rubygems/package_task'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require './tasks/rspec.rb'
 
-GEM_NAME = "chef"
+GEM_NAME = "microwave"
 
-spec = eval(File.read("chef.gemspec"))
+spec = eval(File.read("microwave.gemspec"))
 
 # This has to be here or else the docs get generated *after* the gem is created
 task :gem => 'docs:all'

data/bin/chef-solo

@@ -18,6 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ENV['MICROWAVE_ROOT'] ||= Dir.pwd
+
 require 'rubygems'
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'chef/application/solo'

data/spec/spec_helper.rb

@@ -18,6 +18,8 @@
 # If you need to add anything in here, don't.
 # Add it to one of the files in spec/support
 
+ENV['MICROWAVE_ROOT'] ||= Dir.pwd
+
 # Abuse ruby's constant lookup to avoid undefined constant errors
 module Shef
   JUST_TESTING_MOVE_ALONG = true unless defined? JUST_TESTING_MOVE_ALONG

data/spec/unit/checksum/storage/filesystem_spec.rb

@@ -33,23 +33,23 @@ describe Chef::Checksum::Storage::Filesystem do
   end
 
   it "has the path to the file in the checksum repo" do
-    @storage.file_location.should == "/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399"
+    @storage.file_location.should == Chef::Config.platform_specific_path("/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399")
   end
 
   it "has the path the the file's subdirectory in the checksum repo" do
-    @storage.checksum_repo_directory.should == "/var/chef/checksums/3f"
+    @storage.checksum_repo_directory.should == Chef::Config.platform_specific_path("/var/chef/checksums/3f")
   end
 
   it "commits a file from a given location to the checksum repo location" do
     File.should_receive(:rename).with("/tmp/arbitrary_file_location", @storage.file_location)
-    FileUtils.should_receive(:mkdir_p).with("/var/chef/checksums/3f")
+    FileUtils.should_receive(:mkdir_p).with(Chef::Config.platform_specific_path("/var/chef/checksums/3f"))
 
     @storage.commit("/tmp/arbitrary_file_location")
   end
 
   it "reverts committing a file" do
     File.should_receive(:rename).with("/tmp/arbitrary_file_location", @storage.file_location)
-    FileUtils.should_receive(:mkdir_p).with("/var/chef/checksums/3f")
+    FileUtils.should_receive(:mkdir_p).with(Chef::Config.platform_specific_path("/var/chef/checksums/3f"))
     @storage.commit("/tmp/arbitrary_file_location")
 
     File.should_receive(:rename).with(@storage.file_location, "/tmp/arbitrary_file_location")

data/spec/unit/config_spec.rb

@@ -129,18 +129,21 @@ describe Chef::Config do
     it "should return given path on non-windows systems" do
       platform_mock :unix do
         path = "/etc/chef/cookbooks"
-        Chef::Config.platform_specific_path(path).should == "/etc/chef/cookbooks"
+        Chef::Config.platform_specific_path(path).should == "#{ENV['MICROWAVE_ROOT']}/etc/chef/cookbooks"
       end
     end
 
     it "should return a windows path on windows systems" do
       platform_mock :windows do
         path = "/etc/chef/cookbooks"
+        save_microwave_root = ENV['MICROWAVE_ROOT']
+        expected_microwave_root = save_microwave_root.gsub(File::SEPARATOR, (File::ALT_SEPARATOR || '\\'))
+        ENV.stub!(:[]).with('MICROWAVE_ROOT').and_return(save_microwave_root)
         ENV.stub!(:[]).with('SYSTEMDRIVE').and_return('C:')
         # match on a regex that looks for the base path with an optional
         # system drive at the beginning (c:)
         # system drive is not hardcoded b/c it can change and b/c it is not present on linux systems
-        Chef::Config.platform_specific_path(path).should == "C:\\chef\\cookbooks"
+        Chef::Config.platform_specific_path(path).should == "C:#{expected_microwave_root}\\chef\\cookbooks"
       end
     end
   end
@@ -160,7 +163,7 @@ describe Chef::Config do
       backup_path = if windows?
         "#{ENV['SYSTEMDRIVE']}\\chef\\backup"
       else
-        "/var/chef/backup"
+        Chef::Config.platform_specific_path("/var/chef/backup")
       end
       Chef::Config[:file_backup_path].should == backup_path
     end
@@ -181,7 +184,7 @@ describe Chef::Config do
       data_bag_path = if windows?
         "C:\\chef\\data_bags"
       else
-        "/var/chef/data_bags"
+        Chef::Config.platform_specific_path("/var/chef/data_bags")
       end
 
       Chef::Config[:data_bag_path].should == data_bag_path

data/spec/unit/data_bag_spec.rb

@@ -127,7 +127,7 @@ describe Chef::DataBag do
     describe "in solo mode" do
       before do
         Chef::Config[:solo] = true
-        Chef::Config[:data_bag_path] = '/var/chef/data_bags'
+        Chef::Config[:data_bag_path] = Chef::Config.platform_specific_path('/var/chef/data_bags')
       end
 
       after do
@@ -135,32 +135,32 @@ describe Chef::DataBag do
       end
 
       it "should get the data bag from the data_bag_path" do
-        File.should_receive(:directory?).with('/var/chef/data_bags').and_return(true)
-        Dir.should_receive(:glob).with('/var/chef/data_bags/foo/*.json').and_return([])
+        File.should_receive(:directory?).with(Chef::Config.platform_specific_path('/var/chef/data_bags')).and_return(true)
+        Dir.should_receive(:glob).with(Chef::Config.platform_specific_path('/var/chef/data_bags/foo/*.json')).and_return([])
         Chef::DataBag.load('foo')
       end
 
       it "should get the data bag from the data_bag_path by symbolic name" do
-        File.should_receive(:directory?).with('/var/chef/data_bags').and_return(true)
-        Dir.should_receive(:glob).with('/var/chef/data_bags/foo/*.json').and_return([])
+        File.should_receive(:directory?).with(Chef::Config.platform_specific_path('/var/chef/data_bags')).and_return(true)
+        Dir.should_receive(:glob).with(Chef::Config.platform_specific_path('/var/chef/data_bags/foo/*.json')).and_return([])
         Chef::DataBag.load(:foo)
       end
 
       it "should return the data bag" do
-        File.should_receive(:directory?).with('/var/chef/data_bags').and_return(true)
-        Dir.stub!(:glob).and_return(["/var/chef/data_bags/foo/bar.json", "/var/chef/data_bags/foo/baz.json"])
-        IO.should_receive(:read).with('/var/chef/data_bags/foo/bar.json').and_return('{"id": "bar", "name": "Bob Bar" }')
-        IO.should_receive(:read).with('/var/chef/data_bags/foo/baz.json').and_return('{"id": "baz", "name": "John Baz" }')
+        File.should_receive(:directory?).with(Chef::Config.platform_specific_path('/var/chef/data_bags')).and_return(true)
+        Dir.stub!(:glob).and_return([Chef::Config.platform_specific_path("/var/chef/data_bags/foo/bar.json"), Chef::Config.platform_specific_path("/var/chef/data_bags/foo/baz.json")])
+        IO.should_receive(:read).with(Chef::Config.platform_specific_path('/var/chef/data_bags/foo/bar.json')).and_return('{"id": "bar", "name": "Bob Bar" }')
+        IO.should_receive(:read).with(Chef::Config.platform_specific_path('/var/chef/data_bags/foo/baz.json')).and_return('{"id": "baz", "name": "John Baz" }')
         data_bag = Chef::DataBag.load('foo')
         data_bag.should == { 'bar' => { 'id' => 'bar', 'name' => 'Bob Bar' }, 'baz' => { 'id' => 'baz', 'name' => 'John Baz' }}
       end
 
       it 'should raise an error if the configured data_bag_path is invalid' do
-        File.should_receive(:directory?).with('/var/chef/data_bags').and_return(false)
+        File.should_receive(:directory?).with(Chef::Config.platform_specific_path('/var/chef/data_bags')).and_return(false)
 
         lambda {
           Chef::DataBag.load('foo')
-        }.should raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' is invalid"
+        }.should raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{Chef::Config.platform_specific_path('/var/chef/data_bags')}' is invalid"
       end
 
     end

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -58,7 +58,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
         "/home/someuser/.multiruby/gems/chef/lib/chef/client.rb:123:in `run'"
       ]
       @exception.set_backtrace(@trace)
-      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @path = Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb")
       @inspector = described_class.new(@path, @exception)
 
       @expected_filtered_trace = [
@@ -71,16 +71,16 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
 
   describe "when explaining an error in the compile phase" do
     before do
-      Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache/cookbooks" ])
+      Chef::Config.stub!(:cookbook_path).and_return([ Chef::Config.platform_specific_path("/var/chef/cache/cookbooks") ])
       recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
-      IO.should_receive(:readlines).with("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb").and_return(recipe_lines)
+      IO.should_receive(:readlines).with(Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb")).and_return(recipe_lines)
       @trace = [
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+        Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'"),
+        Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'"),
         "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
       ]
       @exception.set_backtrace(@trace)
-      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @path = Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb")
       @inspector = described_class.new(@path, @exception)
       @inspector.add_explanation(@description)
     end
@@ -123,7 +123,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
         "C:/opscode/chef/bin/chef-client:19:in `<main>'"
       ]
       @exception.set_backtrace(@trace)
-      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @path = Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb")
       @inspector = described_class.new(@path, @exception)
       @inspector.add_explanation(@description)
     end
@@ -181,7 +181,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
         "c:/opscode/chef/bin/chef-client:19:in `<main>'"
       ]
       @exception.set_backtrace(@trace)
-      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @path = Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb")
       @inspector = described_class.new(@path, @exception)
       @inspector.add_explanation(@description)
     end

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -38,7 +38,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
     @outputter = Chef::Formatters::Outputter.new(@stdout, STDERR)
     #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
 
-    Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache" ])
+    Chef::Config.stub!(:cookbook_path).and_return([ Chef::Config.platform_specific_path("/var/chef/cache") ])
   end
 
   describe "when explaining an error converging a resource" do
@@ -55,8 +55,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       end
 
       @trace = [
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+        Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'"),
+        Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'"),
         "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
       ]
       @exception = Chef::Exceptions::Package.new("No such package 'non-existing-package'")
@@ -67,8 +67,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
 
     it "filters chef core code from the backtrace" do
       @expected_filtered_trace = [
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+        Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'"),
+        Chef::Config.platform_specific_path("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'"),
       ]
 
       @inspector.filtered_bt.should == @expected_filtered_trace

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: microwave
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Adam Jacob
@@ -264,21 +264,23 @@ dependencies:
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: moneta
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: moneta
+  name: erubis
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -453,122 +455,6 @@ files:
 - Rakefile
 - LICENSE
 - README.rdoc
-- distro/arch/etc/conf.d/chef-client.conf
-- distro/arch/etc/conf.d/chef-expander.conf
-- distro/arch/etc/conf.d/chef-server-webui.conf
-- distro/arch/etc/conf.d/chef-server.conf
-- distro/arch/etc/conf.d/chef-solr.conf
-- distro/arch/etc/rc.d/chef-client
-- distro/arch/etc/rc.d/chef-expander
-- distro/arch/etc/rc.d/chef-server
-- distro/arch/etc/rc.d/chef-server-webui
-- distro/arch/etc/rc.d/chef-solr
-- distro/common/html/chef-client.8.html
-- distro/common/html/chef-expander.8.html
-- distro/common/html/chef-expanderctl.8.html
-- distro/common/html/chef-server-webui.8.html
-- distro/common/html/chef-server.8.html
-- distro/common/html/chef-solo.8.html
-- distro/common/html/chef-solr.8.html
-- distro/common/html/knife-bootstrap.1.html
-- distro/common/html/knife-client.1.html
-- distro/common/html/knife-configure.1.html
-- distro/common/html/knife-cookbook-site.1.html
-- distro/common/html/knife-cookbook.1.html
-- distro/common/html/knife-data-bag.1.html
-- distro/common/html/knife-environment.1.html
-- distro/common/html/knife-exec.1.html
-- distro/common/html/knife-index.1.html
-- distro/common/html/knife-node.1.html
-- distro/common/html/knife-recipe.1.html
-- distro/common/html/knife-role.1.html
-- distro/common/html/knife-search.1.html
-- distro/common/html/knife-ssh.1.html
-- distro/common/html/knife-status.1.html
-- distro/common/html/knife-tag.1.html
-- distro/common/html/knife.1.html
-- distro/common/html/shef.1.html
-- distro/common/man/man1/knife-bootstrap.1
-- distro/common/man/man1/knife-client.1
-- distro/common/man/man1/knife-configure.1
-- distro/common/man/man1/knife-cookbook-site.1
-- distro/common/man/man1/knife-cookbook.1
-- distro/common/man/man1/knife-data-bag.1
-- distro/common/man/man1/knife-environment.1
-- distro/common/man/man1/knife-exec.1
-- distro/common/man/man1/knife-index.1
-- distro/common/man/man1/knife-node.1
-- distro/common/man/man1/knife-role.1
-- distro/common/man/man1/knife-search.1
-- distro/common/man/man1/knife-ssh.1
-- distro/common/man/man1/knife-status.1
-- distro/common/man/man1/knife-tag.1
-- distro/common/man/man1/knife.1
-- distro/common/man/man1/shef.1
-- distro/common/man/man8/chef-client.8
-- distro/common/man/man8/chef-expander.8
-- distro/common/man/man8/chef-expanderctl.8
-- distro/common/man/man8/chef-server-webui.8
-- distro/common/man/man8/chef-server.8
-- distro/common/man/man8/chef-solo.8
-- distro/common/man/man8/chef-solr.8
-- distro/common/markdown/man1/knife-bootstrap.mkd
-- distro/common/markdown/man1/knife-client.mkd
-- distro/common/markdown/man1/knife-configure.mkd
-- distro/common/markdown/man1/knife-cookbook-site.mkd
-- distro/common/markdown/man1/knife-cookbook.mkd
-- distro/common/markdown/man1/knife-data-bag.mkd
-- distro/common/markdown/man1/knife-environment.mkd
-- distro/common/markdown/man1/knife-exec.mkd
-- distro/common/markdown/man1/knife-index.mkd
-- distro/common/markdown/man1/knife-node.mkd
-- distro/common/markdown/man1/knife-role.mkd
-- distro/common/markdown/man1/knife-search.mkd
-- distro/common/markdown/man1/knife-ssh.mkd
-- distro/common/markdown/man1/knife-status.mkd
-- distro/common/markdown/man1/knife-tag.mkd
-- distro/common/markdown/man1/knife.mkd
-- distro/common/markdown/man1/shef.mkd
-- distro/common/markdown/man8/chef-client.mkd
-- distro/common/markdown/man8/chef-expander.mkd
-- distro/common/markdown/man8/chef-expanderctl.mkd
-- distro/common/markdown/man8/chef-server-webui.mkd
-- distro/common/markdown/man8/chef-server.mkd
-- distro/common/markdown/man8/chef-solo.mkd
-- distro/common/markdown/man8/chef-solr.mkd
-- distro/common/markdown/README
-- distro/debian/etc/default/chef-client
-- distro/debian/etc/default/chef-expander
-- distro/debian/etc/default/chef-server
-- distro/debian/etc/default/chef-server-webui
-- distro/debian/etc/default/chef-solr
-- distro/debian/etc/init/chef-client.conf
-- distro/debian/etc/init/chef-expander.conf
-- distro/debian/etc/init/chef-server-webui.conf
-- distro/debian/etc/init/chef-server.conf
-- distro/debian/etc/init/chef-solr.conf
-- distro/debian/etc/init.d/chef-client
-- distro/debian/etc/init.d/chef-expander
-- distro/debian/etc/init.d/chef-server
-- distro/debian/etc/init.d/chef-server-webui
-- distro/debian/etc/init.d/chef-solr
-- distro/README
-- distro/redhat/etc/init.d/chef-client
-- distro/redhat/etc/init.d/chef-expander
-- distro/redhat/etc/init.d/chef-server
-- distro/redhat/etc/init.d/chef-server-webui
-- distro/redhat/etc/init.d/chef-solr
-- distro/redhat/etc/logrotate.d/chef-client
-- distro/redhat/etc/logrotate.d/chef-expander
-- distro/redhat/etc/logrotate.d/chef-server
-- distro/redhat/etc/logrotate.d/chef-server-webui
-- distro/redhat/etc/logrotate.d/chef-solr
-- distro/redhat/etc/sysconfig/chef-client
-- distro/redhat/etc/sysconfig/chef-expander
-- distro/redhat/etc/sysconfig/chef-server
-- distro/redhat/etc/sysconfig/chef-server-webui
-- distro/redhat/etc/sysconfig/chef-solr
-- distro/windows/service_manager.rb
 - lib/chef.rb
 - tasks/rspec.rb
 - spec/data/bad-config.rb

data/distro/README

@@ -1,2 +0,0 @@
-Init scripts meant to be used with a gem installation via the bootstrap
-cookbook.

data/distro/arch/etc/conf.d/chef-client.conf

@@ -1,5 +0,0 @@
-LOGFILE=/var/log/chef/client.log
-CONFIG=/etc/chef/client.rb
-INTERVAL=1800
-SPLAY=20
-CHEF_CLIENT_ARGS="-L $LOGFILE -d -c $CONFIG -i $INTERVAL -s $SPLAY"

data/distro/arch/etc/conf.d/chef-expander.conf

@@ -1,8 +0,0 @@
-LOGFILE=/var/log/chef/expander.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-DIETIME=5
-STARTTIME=5
-CHEF_EXPANDER_ARGS="-d -c $CONFIG -L $LOGFILE -n 1 -i 1"

data/distro/arch/etc/conf.d/chef-server-webui.conf

@@ -1,10 +0,0 @@
-LOGFILE=/var/log/chef/server-webui.log
-CONFIG=/etc/chef/webui.rb
-ADAPTER=thin
-PORT=4040
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-STARTTIME=10
-DIETIME=5
-CHEF_SERVER_WEBUI_ARGS="-p $PORT -e production -d -a $ADAPTER -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"

data/distro/arch/etc/conf.d/chef-server.conf

@@ -1,10 +0,0 @@
-LOGFILE=/var/log/chef/server.log
-CONFIG=/etc/chef/server.rb
-ADAPTER=thin
-PORT=4000
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-STARTTIME=10
-DIETIME=5
-CHEF_SERVER_ARGS="-p $PORT -e production -d -a $ADAPTER -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"