ridley 0.8.6 → 0.9.0

data/.travis.yml

@@ -4,7 +4,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-

data/lib/ridley/chef/cookbook/syntax_check.rb

@@ -12,9 +12,9 @@ module Ridley::Chef
     # 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.
@@ -91,13 +91,7 @@ module Ridley::Chef
       end
 
       def untested_ruby_files
-        ruby_files.reject do |file|
-          if validated?(file)
-            true
-          else
-            false
-          end
-        end
+        ruby_files.reject { |file| validated?(file) }
       end
 
       def template_files
@@ -105,13 +99,7 @@ module Ridley::Chef
       end
 
       def untested_template_files
-        template_files.reject do |file| 
-          if validated?(file)
-            true
-          else
-            false
-          end
-        end
+        template_files.reject { |file| validated?(file) }
       end
 
       def validated?(file)
@@ -137,18 +125,18 @@ module Ridley::Chef
       end
 
       def validate_template(erb_file)
-        result = shell_out("erubis -x #{erb_file} | ruby -c")
+        result = quietly { shell_out("erubis -x #{erb_file} | ruby -c") }
         result.error!
         true
       rescue Mixlib::ShellOut::ShellCommandFailed
         file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
         log.error { "Erb template #{file_relative_path} has a syntax error:" }
-        result.stderr.each_line { |l| Ridley.log..fatal(l.chomp) }
+        result.stderr.each_line { |l| Ridley.log.fatal(l.chomp) }
         false
       end
 
       def validate_ruby_file(ruby_file)
-        result = shell_out("ruby -c #{ruby_file}")
+        result = quietly { shell_out("ruby -c #{ruby_file}") }
         result.error!
         true
       rescue Mixlib::ShellOut::ShellCommandFailed

data/lib/ridley/chef/cookbook.rb

@@ -74,6 +74,9 @@ module Ridley::Chef
     #     }
     attr_reader :manifest
 
+    # @return [Boolean]
+    attr_accessor :frozen
+
     def_delegator :@metadata, :version
 
     def initialize(name, path, metadata)
@@ -92,6 +95,7 @@ module Ridley::Chef
         providers: Array.new,
         root_files: Array.new
       )
+      @frozen        = false
 
       load_files
     end
@@ -166,11 +170,11 @@ module Ridley::Chef
     def validate
       raise IOError, "No Cookbook found at: #{path}" unless path.exist?
 
-      unless quietly { syntax_checker.validate_ruby_files }
-        raise Ridley::Errors::CookbookSyntaxError, "Invalid ruby files in cookbook: #{name} (#{version})."
+      unless syntax_checker.validate_ruby_files
+        raise Ridley::Errors::CookbookSyntaxError, "Invalid ruby files in cookbook: #{cookbook_name} (#{version})."
       end
-      unless quietly { syntax_checker.validate_templates }
-        raise Ridley::Errors::CookbookSyntaxError, "Invalid template files in cookbook: #{name} (#{version})."
+      unless syntax_checker.validate_templates
+        raise Ridley::Errors::CookbookSyntaxError, "Invalid template files in cookbook: #{cookbook_name} (#{version})."
       end
 
       true
@@ -183,13 +187,13 @@ module Ridley::Chef
       result[:cookbook_name] = cookbook_name
       result[:version]       = version
       result[:metadata]      = metadata
+      result[:frozen?]       = frozen
       result.to_hash
     end
 
     def to_json(*args)
       result               = self.to_hash
       result['json_class'] = CHEF_JSON_CLASS
-      result['frozen?']    = false
       result.to_json(*args)
     end
 

data/lib/ridley/errors.rb

@@ -49,6 +49,8 @@ module Ridley
       end
     end
 
+    class FrozenCookbook < RidleyError; end
+
     class HTTPError < RidleyError
       class << self
         def fabricate(env)

data/lib/ridley/resources/cookbook_resource.rb

@@ -29,10 +29,6 @@ module Ridley
         end
       end
 
-      def create(*args)
-        raise NotImplementedError
-      end
-
       # Delete a cookbook of the given name and version on the remote Chef server
       #
       # @param [Ridley::Client] client
@@ -140,15 +136,12 @@ module Ridley
         nil
       end
 
-      # Save a new Cookbook Version of the given name, version with the
+      # Update or create a new Cookbook Version of the given name, version with the
       # given manifest of files and checksums.
       #
       # @param [Ridley::Client] client
-      # @param [String] name
-      # @param [String] version
-      # @param [String] manifest
-      #   a JSON blob containing file names, file paths, and checksums for each
-      #   that describe the cookbook version being uploaded.
+      # @param [Ridley::Chef::Cookbook] cookbook
+      #   the cookbook to save
       #
       # @option options [Boolean] :force
       #   Upload the Cookbook even if the version already exists and is frozen on
@@ -157,19 +150,25 @@ module Ridley
       #   Freeze the uploaded Cookbook on the Chef Server so that it cannot be
       #   overwritten
       #
+      # @raise [Ridley::Errors::FrozenCookbook]
+      #   if a cookbook of the same name and version already exists on the remote Chef server
+      #   and is frozen. If the :force option is provided the given cookbook will be saved
+      #   regardless.
+      #
       # @return [Hash]
-      def save(client, name, version, manifest, options = {})
+      def update(client, cookbook, options = {})
         options.reverse_merge(force: false, freeze: false)
 
-        url = "cookbooks/#{name}/#{version}"
-        url << "?force=true" if options[:force]
+        cookbook.frozen = options[:freeze]
 
-        client.connection.put(url, manifest)
-      end
+        url = "cookbooks/#{cookbook.cookbook_name}/#{cookbook.version}"
+        url << "?force=true" if options[:force]
 
-      def update(*args)
-        raise NotImplementedError
+        client.connection.put(url, cookbook.to_json)
+      rescue Ridley::Errors::HTTPConflict => ex
+        raise Ridley::Errors::FrozenCookbook, ex
       end
+      alias_method :create, :update
 
       # Uploads a cookbook to the remote Chef server from the contents of a filepath
       #
@@ -195,17 +194,24 @@ module Ridley
         options   = options.reverse_merge(validate: true, force: false, freeze: false)
         cookbook  = Ridley::Chef::Cookbook.from_path(path, options.slice(:name))
 
+        unless (existing = find(client, cookbook.cookbook_name, cookbook.version)).nil?
+          if existing.frozen? && options[:force] == false
+            msg = "The cookbook #{cookbook.cookbook_name} (#{cookbook.version}) already exists and is"
+            msg << " frozen on the Chef server. Use the 'force' option to override."
+            raise Ridley::Errors::FrozenCookbook, msg
+          end
+        end
+
         if options[:validate]
           cookbook.validate
         end
 
-        name      = options[:name] || cookbook.name
         checksums = cookbook.checksums.dup
         sandbox   = client.sandbox.create(checksums.keys)
 
         sandbox.upload(checksums)
         sandbox.commit
-        save(client, name, cookbook.version, cookbook.to_json, options.slice(:force, :freeze))
+        update(client, cookbook, options.slice(:force, :freeze))
       end
 
       # Return a list of versions for the given cookbook present on the remote Chef server
@@ -293,6 +299,9 @@ module Ridley
     attribute :version,
       type: String
 
+    attribute :frozen?,
+      type: Boolean
+
     # Download the entire cookbook
     #
     # @param [String] destination (Dir.mktmpdir)

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

data/spec/unit/ridley/chef/cookbook_spec.rb

@@ -150,6 +150,10 @@ describe Ridley::Chef::Cookbook do
   describe "#to_hash" do
     subject { cookbook.to_hash }
 
+    it "has a :frozen? flag" do
+      subject.should have_key(:frozen?)
+    end
+
     it "has a :recipes key with a value of an Array Hashes" do
       subject.should have_key(:recipes)
       subject[:recipes].should be_a(Array)
@@ -408,5 +412,9 @@ describe Ridley::Chef::Cookbook do
       @json.should have_json_path('json_class')
       parse_json(@json)['json_class'].should eql(Ridley::Chef::Cookbook::CHEF_JSON_CLASS)
     end
+
+    it "has a 'frozen?' flag" do
+      @json.should have_json_path('frozen?')
+    end
   end
 end

data/spec/unit/ridley/resources/cookbook_resource_spec.rb

@@ -6,6 +6,7 @@ describe Ridley::CookbookResource do
   subject { described_class.new(client) }
 
   describe "ClassMethods" do
+    subject { described_class }
     let(:server_url) { "https://api.opscode.com/organizations/vialstudios" }
     let(:client_name) { "reset" }
     let(:client_key) { fixtures_path.join("reset.pem") }
@@ -132,7 +133,7 @@ describe Ridley::CookbookResource do
     end
 
     describe "::versions" do
-      let(:cookbook) { "artifact" }      
+      let(:cookbook) { "artifact" }
       subject { described_class.versions(client, cookbook) }
 
       before(:each) do
@@ -169,6 +170,14 @@ describe Ridley::CookbookResource do
         subject.should include("1.2.0")
       end
     end
+
+    describe "::upload" do
+      pending
+    end
+
+    describe "::update" do
+      pending
+    end
   end
 
   describe "#download" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3721242510601733249
+      hash: 141649622166830890
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24