chef-dk 0.3.0 → 0.3.5

data/lib/chef-dk/policyfile/storage_config.rb

@@ -16,6 +16,7 @@
 #
 
 require 'chef-dk/cookbook_omnifetch'
+require 'chef-dk/exceptions'
 
 module ChefDK
   module Policyfile
@@ -37,23 +38,37 @@ module ChefDK
       end
 
       def use_policyfile(policyfile_filename)
+        unless policyfile_filename.end_with?(".rb")
+          raise InvalidPolicyfileFilename, "Policyfile filenames must end with `.rb' extension (you gave: `#{policyfile_filename}')"
+        end
         @policyfile_filename = policyfile_filename
+        @policyfile_lock_filename = policyfile_filename.sub(/\.rb\Z/, '.lock.json')
         @relative_paths_root = File.dirname(policyfile_filename)
         self
       end
 
       def use_policyfile_lock(policyfile_lock_filename)
         @policyfile_lock_filename = policyfile_lock_filename
+        @policyfile_filename = policyfile_lock_filename.sub(/\.lock\.json\Z/, '.rb')
         @relative_paths_root = File.dirname(policyfile_lock_filename)
         self
       end
 
+      def policyfile_expanded_path
+        File.expand_path(policyfile_filename, relative_paths_root)
+      end
+
+      def policyfile_lock_expanded_path
+        File.expand_path(policyfile_lock_filename, relative_paths_root)
+      end
+
       private
 
       def handle_options(options)
         @cache_path = options[:cache_path] if options[:cache_path]
         @relative_paths_root = options[:relative_paths_root] if options.key?(:relative_paths_root)
       end
+
     end
 
     module StorageConfigDelegation
@@ -70,6 +85,14 @@ module ChefDK
         storage_config.policyfile_filename
       end
 
+      def policyfile_expanded_path
+        storage_config.policyfile_expanded_path
+      end
+
+      def policyfile_lock_expanded_path
+        storage_config.policyfile_lock_expanded_path
+      end
+
     end
 
   end

data/lib/chef-dk/policyfile/uploader.rb

@@ -119,7 +119,7 @@ module ChefDK
       def upload_cookbooks
         ui.msg("WARN: Uploading cookbooks using semver compat mode")
 
-        uploader.upload_cookbooks
+        uploader.upload_cookbooks unless cookbook_versions_to_upload.empty?
 
         reused_cbs, uploaded_cbs = cookbook_versions_for_policy.partition do |cb_with_lock|
           remote_already_has_cookbook?(cb_with_lock.cookbook)

data/lib/chef-dk/policyfile_services/install.rb

@@ -15,7 +15,9 @@
 # limitations under the License.
 #
 
-require 'chef-dk/exceptions'
+require 'ffi_yajl'
+
+require 'chef-dk/service_exceptions'
 require 'chef-dk/policyfile_compiler'
 require 'chef-dk/policyfile/storage_config'
 require 'chef-dk/policyfile_lock'
@@ -25,54 +27,43 @@ module ChefDK
 
     class Install
 
-      attr_reader :root_dir
+      include Policyfile::StorageConfigDelegation
+      include ChefDK::Helpers
+
       attr_reader :ui
+      attr_reader :storage_config
 
       def initialize(policyfile: nil, ui: nil, root_dir: nil)
-        @policyfile_relative_path = policyfile
         @ui = ui
-        @root_dir = root_dir
+
+        policyfile_rel_path = policyfile || "Policyfile.rb"
+        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
+        @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
 
         @policyfile_content = nil
         @policyfile_compiler = nil
       end
 
       def run
-        unless File.exist?(policyfile_path)
+        unless File.exist?(policyfile_expanded_path)
           # TODO: suggest next step. Add a generator/init command? Specify path to Policyfile.rb?
           # See card CC-232
-          raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_path}"
+          raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
         end
 
-        if File.exist?(lockfile_path)
+        if File.exist?(policyfile_lock_expanded_path)
           install_from_lock
         else
           generate_lock_and_install
         end
       end
 
-      def policyfile_relative_path
-        @policyfile_relative_path || "Policyfile.rb"
-      end
-
-      def policyfile_path
-        File.expand_path(policyfile_relative_path, root_dir)
-      end
-
-      def lockfile_relative_path
-        policyfile_relative_path.gsub(/\.rb\Z/, '') + ".lock.json"
-      end
-
-      def lockfile_path
-        File.expand_path(lockfile_relative_path, root_dir)
-      end
-
       def policyfile_content
-        @policyfile_content ||= IO.read(policyfile_path)
+        @policyfile_content ||= IO.read(policyfile_expanded_path)
       end
 
       def policyfile_compiler
-        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_path, ui: ui)
+        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui)
       end
 
       def expanded_run_list
@@ -80,7 +71,7 @@ module ChefDK
       end
 
       def policyfile_lock_content
-        @policyfile_lock_content ||= IO.read(lockfile_path) if File.exist?(lockfile_path)
+        @policyfile_lock_content ||= IO.read(policyfile_lock_expanded_path) if File.exist?(policyfile_lock_expanded_path)
       end
 
       def policyfile_lock
@@ -91,10 +82,6 @@ module ChefDK
         end
       end
 
-      def storage_config
-        @storage_config ||= Policyfile::StorageConfig.new(relative_paths_root: root_dir)
-      end
-
       def generate_lock_and_install
         policyfile_compiler.error!
 
@@ -107,13 +94,13 @@ module ChefDK
 
         lock_data = policyfile_compiler.lock.to_lock
 
-        File.open(lockfile_path, "w+") do |f|
+        with_file(policyfile_lock_expanded_path) do |f|
           f.print(FFI_Yajl::Encoder.encode(lock_data, pretty: true ))
         end
 
         ui.msg ""
 
-        ui.msg "Lockfile written to #{lockfile_path}"
+        ui.msg "Lockfile written to #{policyfile_lock_expanded_path}"
       rescue => error
         raise PolicyfileInstallError.new("Failed to generate Policyfile.lock", error)
       end

data/lib/chef-dk/policyfile_services/push.rb

@@ -15,47 +15,41 @@
 # limitations under the License.
 #
 
+require 'ffi_yajl'
+
+require 'chef-dk/service_exceptions'
 require 'chef-dk/authenticated_http'
 require 'chef-dk/policyfile_compiler'
 require 'chef-dk/policyfile/uploader'
+require 'chef-dk/policyfile/storage_config'
 
 module ChefDK
   module PolicyfileServices
     class Push
 
+      include Policyfile::StorageConfigDelegation
+      include ChefDK::Helpers
+
       attr_reader :root_dir
       attr_reader :config
       attr_reader :policy_group
       attr_reader :ui
+      attr_reader :storage_config
 
       def initialize(policyfile: nil, ui: nil, policy_group: nil, config: nil, root_dir: nil)
         @root_dir = root_dir
-        @policyfile_relative_path = policyfile
         @ui = ui
         @config = config
         @policy_group = policy_group
 
+        policyfile_rel_path = policyfile || "Policyfile.rb"
+        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
+        @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
+
         @http_client = nil
-        @storage_config = nil
         @policy_data = nil
       end
 
-      def policyfile_relative_path
-        @policyfile_relative_path || "Policyfile.rb"
-      end
-
-      def policyfile_path
-        File.expand_path(policyfile_relative_path, root_dir)
-      end
-
-      def lockfile_relative_path
-        policyfile_relative_path.gsub(/\.rb\Z/, '') + ".lock.json"
-      end
-
-      def lockfile_path
-        File.expand_path(lockfile_relative_path, root_dir)
-      end
-
       def http_client
         @http_client ||= ChefDK::AuthenticatedHTTP.new(config.chef_server_url,
                                                        signing_key_filename: config.client_key,
@@ -63,13 +57,9 @@ module ChefDK
       end
 
       def policy_data
-        @policy_data ||= FFI_Yajl::Parser.parse(IO.read(lockfile_path))
+        @policy_data ||= FFI_Yajl::Parser.parse(IO.read(policyfile_lock_expanded_path))
       rescue => error
-        raise PolicyfilePushError.new("Error reading lockfile #{lockfile_path}", error)
-      end
-
-      def storage_config
-        @storage_config ||= ChefDK::Policyfile::StorageConfig.new.use_policyfile_lock(lockfile_path)
+        raise PolicyfilePushError.new("Error reading lockfile #{policyfile_lock_expanded_path}", error)
       end
 
       def uploader
@@ -77,8 +67,8 @@ module ChefDK
       end
 
       def run
-        unless File.exist?(lockfile_path)
-          raise LockfileNotFound, "No lockfile at #{lockfile_path} - you need to run `install` before `push`"
+        unless File.exist?(policyfile_lock_expanded_path)
+          raise LockfileNotFound, "No lockfile at #{policyfile_lock_expanded_path} - you need to run `install` before `push`"
         end
 
         validate_lockfile
@@ -100,7 +90,7 @@ module ChefDK
       end
 
       def write_updated_lockfile
-        File.open(lockfile_path, "w+") do |f|
+        with_file(policyfile_lock_expanded_path) do |f|
           f.print(FFI_Yajl::Encoder.encode(policyfile_lock.to_lock, pretty: true ))
         end
       end

data/lib/chef-dk/service_exception_inspectors.rb

@@ -0,0 +1,25 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'chef-dk/service_exception_inspectors/base'
+require 'chef-dk/service_exception_inspectors/http'
+
+module ChefDK
+  module ServiceExceptionInspectors
+  end
+end
+

data/lib/chef-dk/service_exception_inspectors/base.rb

@@ -0,0 +1,40 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+module ChefDK
+  module ServiceExceptionInspectors
+
+    class Base
+
+      attr_reader :exception
+
+      def initialize(exception)
+        @exception = exception
+      end
+
+      def message
+        exception.message
+      end
+
+      def extended_error_info
+        ""
+      end
+
+    end
+  end
+end
+

data/lib/chef-dk/service_exception_inspectors/http.rb

@@ -0,0 +1,121 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'ffi_yajl'
+
+module ChefDK
+  module ServiceExceptionInspectors
+    class HTTP
+
+      attr_reader :exception
+
+      def initialize(exception)
+        @exception = exception
+      end
+
+      def message
+        "HTTP #{code} #{response_message}: " + parsed_response_body
+      end
+
+      def extended_error_info
+        <<-END
+--- REQUEST DATA ----
+#{http_method} #{uri}
+#{request_headers}
+#{req_body}
+
+--- RESPONSE DATA ---
+#{code} #{response_message}
+#{response_headers}
+
+#{response_body}
+
+END
+      end
+
+      def response
+        exception.response
+      end
+
+      def code
+        response.code
+      end
+
+      def response_message
+        response.message
+      end
+
+      def response_body
+        response.body
+      end
+
+      def parsed_response_body
+        if response_body && !response_body.empty?
+          attempt_error_message_extract
+        else
+          "(No explanation provided by server)"
+        end
+      end
+
+      def attempt_error_message_extract
+        error_body = FFI_Yajl::Parser.parse(response_body)
+        if error_body.respond_to?(:key?) && error_body.key?("error")
+          Array(error_body["error"]).join(", ")
+        else
+          error_body.to_s
+        end
+      rescue
+        response_body
+      end
+
+      def response_headers
+        headers_s = ""
+        response.each_header do |key, value|
+          headers_s << key << ": " << value << "\n"
+        end
+        headers_s
+      end
+
+      def request
+        exception.chef_rest_request
+      end
+
+      def uri
+        request.uri.to_s + request.path.to_s
+      end
+
+      def http_method
+        request.method
+      end
+
+      def request_headers
+        headers_s = ""
+        request.each_header do |key, value|
+          headers_s << key << ": " << value << "\n"
+        end
+        headers_s
+      end
+
+      def req_body
+        request.body
+      end
+
+    end
+  end
+end
+
+