clc-promote 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e687f6bcfc1d904507cbee41f0191181eed28273
-  data.tar.gz: 6476cbbfc08c6554abd65bf594c18f50e8ff2a68
+  metadata.gz: b0cd6b4f5ccdee96517ba9b01436fabe5c5fe77a
+  data.tar.gz: c5a8e1d7fe576d91d907d06564e9624df5e8d0d3
 SHA512:
-  metadata.gz: b205d382415d921d2e297084516662ca2a6ab790dfdc815fbc801ad181ee0c406d61052d0e7210c8b36586305e131ee38456c84500b4983ea324f3259ab62686
-  data.tar.gz: 95b580aa5bc01e973620428dcda740369b91eee832a1d016d1ceb52e8c27dd91d111a4a31058b37a630f10f65e8f697e60252426ab364ede0a4eafc031c5229a
+  metadata.gz: f6489be22cbf85bb0d4716c18663e5df0f43d77dbe21022499e760e10da5ac2f7563bc812161f326954e7d6585e7189245fc754ba3f2dc67d56bd337ce214fba
+  data.tar.gz: 510034cdb259d038aae9afa214665318bbf9264aeb1191d242722bacd0ab35177556699ded8e7c86ec8d0635fd87d6bdf0bc0c717a784ebfccbb59dcbd9d666e

data/lib/promote/rake_tasks.rb

@@ -126,8 +126,8 @@ module Promote
       namespace "Promote" do
         desc "Upload an environment to the chef server"
         task "upload_environment", :environment do |task, args|
-          puts "Uploading environment..."
-          @uploader.upload_environment(args.environment)
+          file_uploaded = @uploader.upload_environment(args.environment)
+          puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
         end
       end
     end
@@ -135,9 +135,9 @@ module Promote
     def define_upload_data_bags
       namespace "Promote" do
         desc "Upload data_bags to the chef server"
-        task "upload_data_bags" do |task, args|
-          puts "Uploading data_bags..."
-          @uploader.upload_data_bags
+        task "upload_data_bags" do
+          file_uploaded = @uploader.upload_data_bags
+          puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
         end
       end
     end

data/lib/promote/uploader.rb

@@ -1,5 +1,4 @@
 require 'chef'
-require 'chef/chef_fs/knife'
 require 'chef/chef_fs/parallelizer'
 require 'chef/chef_fs/config'
 require 'chef/chef_fs/file_pattern'
@@ -7,7 +6,6 @@ require 'chef/chef_fs/file_system'
 require 'chef/config'
 require 'chef/knife/cookbook_upload'
 require 'chef/chef_fs/path_utils'
-require 'chef/knife/upload'
 
 module Promote
   class Uploader
@@ -18,6 +16,7 @@ module Promote
       Chef::Config[:client_key] = config.client_key
       Chef::Config[:chef_server_url] = config.chef_server_url
       Chef::Config[:node_name] = config.node_name
+      Chef::Config[:chef_repo_path] = config.repo_root
     end
 
     def upload_cookbooks
@@ -54,27 +53,24 @@ module Promote
     end
         
     def upload_environment(environment_name)
-      knife = Chef::Knife::Upload.new(["/environments/#{environment_name}.json"])
-      knife.config[:chef_repo_path] = config.repo_root
-      Chef::ChefFS::Knife.deps do
-        knife.configure_chef
-        knife.run
-      end
+      upload_file("/environments/#{environment_name}.json")
     end
 
     def upload_data_bags
-      knife = Chef::Knife::Upload.new(["/data_bags"])
-      knife.config[:chef_repo_path] = config.repo_root
-      Chef::ChefFS::Knife.deps do
-        knife.configure_chef
-        knife.run
-      end
+      upload_file("/data_bags")
     end
 
     attr_accessor :config
 
     private
 
+    def upload_file(file_path)
+      fs_config = Chef::ChefFS::Config.new
+      pattern = Chef::ChefFS::FilePattern.new(Chef::ChefFS::PathUtils::join(fs_config.base_path, file_path))
+      Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.local_fs, fs_config.chef_fs, 1, Chef::Config)
+      file_path
+    end
+
     def validate_config
       required_keys = [:client_key, :chef_server_url, :node_name]
       missing_keys = []

data/lib/promote/versioner.rb

@@ -99,7 +99,6 @@ module Promote
         content['cookbook_versions'][dep.name] = dep.locked_version.to_s
       end
 
-      puts "opening #{env_file} and writing #{content}"
       File.open(env_file, 'w') do |out|
         out << JSON.pretty_generate(content)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - CenturyLink Cloud