Merge branch 'master' into cabeca/chef-208

Author: adamhjk

chef-server-slice/Rakefile

@@ -47,7 +47,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install do
+task :install => :package do
   sh %{sudo gem install pkg/#{GEM_NAME}-#{CHEF_SERVER_VERSION} --no-rdoc --no-ri}
 end
 

chef-server-slice/config/init.rb

@@ -21,7 +21,7 @@
 # code and views.
 #
 
-merb_gems_version = "1.0.10"
+merb_gems_version = "> 1.0"
 dependency "merb-haml", merb_gems_version
 dependency "merb-assets", merb_gems_version
 dependency "merb-helpers", merb_gems_version

chef-server/bin/chef-server

@@ -1,5 +1,5 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
-merb_gems_version = "1.0.10"
+merb_gems_version = "> 1.0"
 
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-core", merb_gems_version 

chef-server/config/dependencies.rb

@@ -63,6 +63,7 @@ class Config
       :remotefile_url => "http://localhost:4000",
       :search_url => "http://localhost:4000",
       :couchdb_database => "chef",
+      :couchdb_version => nil,
       :openid_store_couchdb => false,
       :openid_cstore_couchdb => false,
       :openid_store_path => "/var/chef/openid/db",

chef/lib/chef/config.rb

@@ -25,10 +25,11 @@
 class Chef
   class CouchDB
     include Chef::Mixin::ParamsValidate
-    
+
     def initialize(url=nil)
       url ||= Chef::Config[:couchdb_url]
       @rest = Chef::REST.new(url)
+      Chef::Config[:couchdb_version] ||= @rest.run_request(:GET, URI.parse(@rest.url + "/"), false, 10, false)["version"].gsub(/-.+/,"").to_f
     end
 
     def create_db
@@ -119,9 +120,9 @@ def list(view, inflate=false)
         }
       )
       if inflate
-        @rest.get_rest("#{Chef::Config[:couchdb_database]}/_view/#{view}/all")
+        @rest.get_rest(view_uri(view, "all"))
       else
-        @rest.get_rest("#{Chef::Config[:couchdb_database]}/_view/#{view}/all_id")
+        @rest.get_rest(view_uri(view, "all_id"))
       end
     end
 
@@ -145,9 +146,19 @@ def has_key?(obj_type, name)
     end
 
     private
-      def safe_name(name)
-        name.gsub(/\./, "_")
+    
+    def safe_name(name)
+      name.gsub(/\./, "_")
+    end
+      
+    def view_uri(design, view)
+      case Chef::Config[:couchdb_version]
+      when 0.9
+        "#{Chef::Config[:couchdb_database]}/_design/#{design}/_view/#{view}"
+      when 0.8
+        "#{Chef::Config[:couchdb_database]}/_view/#{design}/#{view}"
       end
+    end
 
   end
 end

chef/lib/chef/couchdb.rb

@@ -37,8 +37,12 @@ def negative_complement(big)
         end
         big
       end
+      
+      def octal_mode(mode)
+        ((mode.respond_to?(:oct) ? mode.oct : mode.to_i) & 007777)
+      end
 
-      private :negative_complement
+      private :negative_complement, :octal_mode
 
       def load_current_resource
         @current_resource = Chef::Resource::File.new(@new_resource.name)
@@ -47,7 +51,7 @@ def load_current_resource
           cstats = ::File.stat(@current_resource.path)
           @current_resource.owner(cstats.uid)
           @current_resource.group(cstats.gid)
-          @current_resource.mode("%o" % (cstats.mode & 007777))
+          @current_resource.mode(octal_mode(cstats.mode))
           @current_resource.checksum(checksum(@current_resource.path))
         end
         @current_resource
@@ -104,17 +108,17 @@ def set_group
       def compare_mode
         case @new_resource.mode
         when /^\d+$/, Integer
-          real_mode = sprintf("%o" % (@new_resource.mode & 007777))
-          real_mode.to_i == @current_resource.mode.to_i
+          octal_mode(@new_resource.mode) == octal_mode(@current_resource.mode)
         else
           false
         end
       end
 
       def set_mode
         unless compare_mode && @new_resource.mode != nil
-          Chef::Log.info("Setting mode to #{sprintf("%o" % (@new_resource.mode & 007777))} for #{@new_resource}")
-          ::File.chmod(@new_resource.mode.to_i, @new_resource.path)
+          Chef::Log.info("Setting mode to #{sprintf("%o" % octal_mode(@new_resource.mode))} for #{@new_resource}")
+          # CHEF-174, bad mojo around treating integers as octal.  If a string is passed, we try to do the "right" thing
+          ::File.chmod(octal_mode(@new_resource.mode), @new_resource.path)
           @new_resource.updated = true
         end
       end
@@ -125,9 +129,9 @@ def action_create
           ::File.open(@new_resource.path, "w+") { |f| }
           @new_resource.updated = true
         end
-        set_owner if @new_resource.owner != nil
-        set_group if @new_resource.group != nil
-        set_mode if @new_resource.mode != nil
+        set_owner unless @new_resource.owner.nil?
+        set_group unless @new_resource.group.nil?
+        set_mode unless @new_resource.mode.nil?
       end
 
       def action_create_if_missing

chef/lib/chef/provider/file.rb

@@ -59,7 +59,7 @@ def mode(arg=nil)
         set_or_return(
           :mode,
           arg,
-          :regex => /^\d{3,4}$/
+          :regex => /^0?\d{3,4}$/
         )
       end
 
@@ -81,4 +81,4 @@ def path(arg=nil)
 
     end
   end
-end
+end

chef/lib/chef/resource/file.rb

@@ -19,15 +19,26 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 
 describe Chef::CouchDB, "new" do
+  before do
+    @mock_rest = mock("Chef::REST", :null_object => true)
+    @mock_rest.stub!(:run_request).and_return({"couchdb" => "Welcome", "version" =>"0.9.0"})
+    @mock_rest.stub!(:url).and_return("http://localhost:5984")
+    Chef::REST.stub!(:new).and_return(@mock_rest)
+  end
+  
   it "should create a new Chef::REST object from the default url" do
     Chef::Config[:couchdb_url] = "http://monkey"
-    Chef::REST.should_receive(:new).with("http://monkey").and_return(true)
+    Chef::REST.should_receive(:new).with("http://monkey")
     Chef::CouchDB.new
   end
 
   it "should create a new Chef::REST object from a provided url" do
-    Chef::REST.should_receive(:new).with("http://monkeypants").and_return(true)
+    Chef::REST.should_receive(:new).with("http://monkeypants")
     Chef::CouchDB.new("http://monkeypants")
+  end  
+  
+  it "should parse the CouchDB version number" do
+    
   end
 end
 
@@ -185,18 +196,42 @@ def do_delete(rev=nil)
 
 describe Chef::CouchDB, "list" do
   before(:each) do
-    @mock_rest = mock("Chef::REST", :null_object => true)
+    @mock_rest = mock("Chef::REST", :null_object => true, :url => "http://monkeypants")
     Chef::REST.stub!(:new).and_return(@mock_rest)
+    @couch = Chef::CouchDB.new("http://monkeypants")
+    Chef::Config.stub!(:[]).with(:couchdb_database).and_return("chef")
   end
 
-  it "should get the view for all objects if inflate is true" do
-    @mock_rest.should_receive(:get_rest).with("chef/_view/node/all").and_return(true)
-    Chef::CouchDB.new.list("node", true)
+  describe "on couchdb 0.8" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.8)
+    end
+    
+    it "should get the view for all objects if inflate is true" do
+      @mock_rest.should_receive(:get_rest).with("chef/_view/node/all").and_return(true)
+      @couch.list("node", true)
+    end
+
+    it "should get the view for just the object id's if inflate is false" do
+      @mock_rest.should_receive(:get_rest).with("chef/_view/node/all_id").and_return(true)
+      @couch.list("node", false)
+    end
   end
-  
-  it "should get the view for just the object id's if inflate is false" do
-    @mock_rest.should_receive(:get_rest).with("chef/_view/node/all_id").and_return(true)
-    Chef::CouchDB.new.list("node", false)
+
+  describe "on couchdb 0.9" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.9)
+    end
+    
+    it "should get the view for all objects if inflate is true" do
+      @mock_rest.should_receive(:get_rest).with("chef/_design/node/_view/all").and_return(true)
+      @couch.list("node", true)
+    end
+
+    it "should get the view for just the object id's if inflate is false" do
+      @mock_rest.should_receive(:get_rest).with("chef/_design/node/_view/all_id").and_return(true)
+      @couch.list("node", false)
+    end
   end
 end
 
@@ -216,3 +251,45 @@ def do_delete(rev=nil)
     Chef::CouchDB.new.has_key?("node", "bob").should eql(false)
   end
 end
+
+describe Chef::CouchDB, "safe_name" do
+  before do
+    @couchdb = mock("Chef::CouchDB", :null_object => true)
+    Chef::CouchDB.stub!(:new).and_return(@couchdb)
+  end
+  
+  it "should convert the name to a safe name" do
+    @couchdb.should_receive(:safe_name).with("asdf.lol.com").and_return("asdf_lol_com")
+    @couchdb.safe_name("asdf.lol.com")
+  end
+end
+
+describe Chef::CouchDB, "view_uri" do
+  before do
+    @couchdb = mock("Chef::CouchDB", :null_object => true)
+    Chef::CouchDB.stub!(:new).and_return(@couchdb)
+    Chef::Config.stub!(:[]).with(:couchdb_database).and_return("chef")
+  end
+  
+  describe "on couchdb 0.8" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.8)
+    end
+    
+    it "should output an appropriately formed view URI" do
+      @couchdb.should_receive(:view_uri).with("nodes", "all").and_return("chef/_view/nodes/all")
+      @couchdb.view_uri("nodes", "all")
+    end
+  end
+
+  describe "on couchdb 0.9" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.9)
+    end
+
+    it "should output an appropriately formed view URI" do
+      @couchdb.should_receive(:view_uri).with("nodes", "all").and_return("chef/_design/nodes/_view/all")
+      @couchdb.view_uri("nodes", "all")
+    end
+  end
+end

chef/spec/unit/couchdb_spec.rb

@@ -0,0 +1,61 @@
+#
+# Cookbook Name:: files
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+file "#{node[:tmpdir]}/octal0644.txt" do
+  owner 'nobody'
+  mode 0644
+  action :create
+end
+
+file "#{node[:tmpdir]}/octal2644.txt" do
+  owner 'nobody'
+  mode 02644
+  action :create
+end
+
+file "#{node[:tmpdir]}/decimal644.txt" do
+  owner 'nobody'
+  mode 644
+  action :create
+end
+
+file "#{node[:tmpdir]}/decimal2644.txt" do
+  owner 'nobody'
+  mode 2644
+  action :create
+end
+
+file "#{node[:tmpdir]}/string644.txt" do
+  owner 'nobody'
+  mode "644"
+  action :create
+end
+
+file "#{node[:tmpdir]}/string0644.txt" do
+  owner 'nobody'
+  mode "0644"
+  action :create
+end
+
+file "#{node[:tmpdir]}/string2644.txt" do
+  owner 'nobody'
+  mode "2644"
+  action :create
+end
+