chef-dk 0.11.2 → 0.12.0

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

@@ -1,126 +1,126 @@
-#
-# 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'
-
-require 'chef-dk/helpers'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile_compiler'
-require 'chef-dk/policyfile/storage_config'
-require 'chef-dk/policyfile_lock'
-
-module ChefDK
-  module PolicyfileServices
-
-    class Install
-
-      include Policyfile::StorageConfigDelegation
-      include ChefDK::Helpers
-
-      attr_reader :ui
-      attr_reader :storage_config
-      attr_reader :overwrite
-
-      def initialize(policyfile: nil, ui: nil, root_dir: nil, overwrite: false)
-        @ui = ui
-        @overwrite = overwrite
-
-        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_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_expanded_path}"
-        end
-
-        if installing_from_lock?
-          install_from_lock
-        else
-          generate_lock_and_install
-        end
-      end
-
-      def policyfile_content
-        @policyfile_content ||= IO.read(policyfile_expanded_path)
-      end
-
-      def policyfile_compiler
-        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui)
-      end
-
-      def expanded_run_list
-        policyfile_compiler.expanded_run_list.to_s
-      end
-
-      def policyfile_lock_content
-        @policyfile_lock_content ||= IO.read(policyfile_lock_expanded_path) if File.exist?(policyfile_lock_expanded_path)
-      end
-
-      def policyfile_lock
-        return nil if policyfile_lock_content.nil?
-        @policyfile_lock ||= begin
-          lock_data = FFI_Yajl::Parser.new.parse(policyfile_lock_content)
-          PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(lock_data)
-        end
-      end
-
-      def generate_lock_and_install
-        policyfile_compiler.error!
-
-        ui.msg "Building policy #{policyfile_compiler.name}"
-        ui.msg "Expanded run list: " + expanded_run_list + "\n"
-
-        ui.msg "Caching Cookbooks..."
-
-        policyfile_compiler.install
-
-        lock_data = policyfile_compiler.lock.to_lock
-
-        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 #{policyfile_lock_expanded_path}"
-        ui.msg "Policy revision id: #{policyfile_lock.revision_id}"
-      rescue => error
-        raise PolicyfileInstallError.new("Failed to generate Policyfile.lock", error)
-      end
-
-      def install_from_lock
-        ui.msg "Installing cookbooks from lock"
-
-        policyfile_lock.install_cookbooks
-      rescue => error
-        raise PolicyfileInstallError.new("Failed to install cookbooks from lockfile", error)
-      end
-
-      def installing_from_lock?
-        !@overwrite && File.exist?(policyfile_lock_expanded_path)
-      end
-
-    end
-  end
-end
+#
+# 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'
+
+require 'chef-dk/helpers'
+require 'chef-dk/service_exceptions'
+require 'chef-dk/policyfile_compiler'
+require 'chef-dk/policyfile/storage_config'
+require 'chef-dk/policyfile_lock'
+
+module ChefDK
+  module PolicyfileServices
+
+    class Install
+
+      include Policyfile::StorageConfigDelegation
+      include ChefDK::Helpers
+
+      attr_reader :ui
+      attr_reader :storage_config
+      attr_reader :overwrite
+
+      def initialize(policyfile: nil, ui: nil, root_dir: nil, overwrite: false)
+        @ui = ui
+        @overwrite = overwrite
+
+        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_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_expanded_path}"
+        end
+
+        if installing_from_lock?
+          install_from_lock
+        else
+          generate_lock_and_install
+        end
+      end
+
+      def policyfile_content
+        @policyfile_content ||= IO.read(policyfile_expanded_path)
+      end
+
+      def policyfile_compiler
+        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui)
+      end
+
+      def expanded_run_list
+        policyfile_compiler.expanded_run_list.to_s
+      end
+
+      def policyfile_lock_content
+        @policyfile_lock_content ||= IO.read(policyfile_lock_expanded_path) if File.exist?(policyfile_lock_expanded_path)
+      end
+
+      def policyfile_lock
+        return nil if policyfile_lock_content.nil?
+        @policyfile_lock ||= begin
+          lock_data = FFI_Yajl::Parser.new.parse(policyfile_lock_content)
+          PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(lock_data)
+        end
+      end
+
+      def generate_lock_and_install
+        policyfile_compiler.error!
+
+        ui.msg "Building policy #{policyfile_compiler.name}"
+        ui.msg "Expanded run list: " + expanded_run_list + "\n"
+
+        ui.msg "Caching Cookbooks..."
+
+        policyfile_compiler.install
+
+        lock_data = policyfile_compiler.lock.to_lock
+
+        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 #{policyfile_lock_expanded_path}"
+        ui.msg "Policy revision id: #{policyfile_lock.revision_id}"
+      rescue => error
+        raise PolicyfileInstallError.new("Failed to generate Policyfile.lock", error)
+      end
+
+      def install_from_lock
+        ui.msg "Installing cookbooks from lock"
+
+        policyfile_lock.install_cookbooks
+      rescue => error
+        raise PolicyfileInstallError.new("Failed to install cookbooks from lockfile", error)
+      end
+
+      def installing_from_lock?
+        !@overwrite && File.exist?(policyfile_lock_expanded_path)
+      end
+
+    end
+  end
+end

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

@@ -1,114 +1,114 @@
-#
-# 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'
-
-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
-        @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
-        @policy_data = nil
-      end
-
-      def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(config.chef_server_url,
-                                                       signing_key_filename: config.client_key,
-                                                       client_name: config.node_name)
-      end
-
-      def policy_data
-        @policy_data ||= FFI_Yajl::Parser.parse(IO.read(policyfile_lock_expanded_path))
-      rescue => error
-        raise PolicyfilePushError.new("Error reading lockfile #{policyfile_lock_expanded_path}", error)
-      end
-
-      def uploader
-        ChefDK::Policyfile::Uploader.new(policyfile_lock, policy_group,
-                                         ui: ui,
-                                         http_client: http_client,
-                                         policy_document_native_api: config.policy_document_native_api)
-      end
-
-      def run
-        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
-        write_updated_lockfile
-        upload_policy
-
-      end
-
-      def policyfile_lock
-        @policyfile_lock || validate_lockfile
-      end
-
-      private
-
-      def upload_policy
-        uploader.upload
-      rescue => error
-        raise PolicyfilePushError.new("Failed to upload policy to policy group #{policy_group}", error)
-      end
-
-      def write_updated_lockfile
-        with_file(policyfile_lock_expanded_path) do |f|
-          f.print(FFI_Yajl::Encoder.encode(policyfile_lock.to_lock, pretty: true ))
-        end
-      end
-
-      def validate_lockfile
-        return @policyfile_lock if @policyfile_lock
-        @policyfile_lock = ChefDK::PolicyfileLock.new(storage_config).build_from_lock_data(policy_data)
-        # TODO: enumerate any cookbook that have been updated
-        @policyfile_lock.validate_cookbooks!
-        @policyfile_lock
-      rescue => error
-        raise PolicyfilePushError.new("Invalid lockfile data", error)
-      end
-
-    end
-  end
-end
-
+#
+# 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'
+
+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
+        @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
+        @policy_data = nil
+      end
+
+      def http_client
+        @http_client ||= ChefDK::AuthenticatedHTTP.new(config.chef_server_url,
+                                                       signing_key_filename: config.client_key,
+                                                       client_name: config.node_name)
+      end
+
+      def policy_data
+        @policy_data ||= FFI_Yajl::Parser.parse(IO.read(policyfile_lock_expanded_path))
+      rescue => error
+        raise PolicyfilePushError.new("Error reading lockfile #{policyfile_lock_expanded_path}", error)
+      end
+
+      def uploader
+        ChefDK::Policyfile::Uploader.new(policyfile_lock, policy_group,
+                                         ui: ui,
+                                         http_client: http_client,
+                                         policy_document_native_api: config.policy_document_native_api)
+      end
+
+      def run
+        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
+        write_updated_lockfile
+        upload_policy
+
+      end
+
+      def policyfile_lock
+        @policyfile_lock || validate_lockfile
+      end
+
+      private
+
+      def upload_policy
+        uploader.upload
+      rescue => error
+        raise PolicyfilePushError.new("Failed to upload policy to policy group #{policy_group}", error)
+      end
+
+      def write_updated_lockfile
+        with_file(policyfile_lock_expanded_path) do |f|
+          f.print(FFI_Yajl::Encoder.encode(policyfile_lock.to_lock, pretty: true ))
+        end
+      end
+
+      def validate_lockfile
+        return @policyfile_lock if @policyfile_lock
+        @policyfile_lock = ChefDK::PolicyfileLock.new(storage_config).build_from_lock_data(policy_data)
+        # TODO: enumerate any cookbook that have been updated
+        @policyfile_lock.validate_cookbooks!
+        @policyfile_lock
+      rescue => error
+        raise PolicyfilePushError.new("Invalid lockfile data", error)
+      end
+
+    end
+  end
+end
+