clc-promote 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb2e8ce77e8107d62b221d47dcd485a1b8cfd78
-  data.tar.gz: 484229a859e81b88a960bafc7c5ef690a75c7faf
+  metadata.gz: d1648dc80e86e5091475fbfd5a3f37af2d205650
+  data.tar.gz: 517af2fb1dfc639eb0c7ee913b06203b8e54f10d
 SHA512:
-  metadata.gz: 6efb5d1e4c07b4bf5279729caf7415fa1007809f66a683632658d79127785e9f25b5442f2e3d6bedefbe4dadbfa6980798c83453848ae2a170885b88a2f56e4f
-  data.tar.gz: 14fc885442580739a00e46ab152d27baf4ef7adfa33d5d7d6451c3036f504dab57d2039fbdfe524673a246bf85fadb57b303e364fe0481df3751c6e537673efc
+  metadata.gz: f3707c1103ab6bab1a1e1e5279af57858274073a16b4240212b9ebc2ba611369505785fd2b3d547afa683d5091888dd811b8d6fbba4088946ef2353f8291436b
+  data.tar.gz: 044f7283e1ba7275c6f29ee1a0d5a77897741d0b9fff09486398af22e33ca35484b65d6afd8d2200c29c6886abaf7e84e18a9cc116a746030e6fb7fdd73e4c10

data/README.md

@@ -72,7 +72,7 @@ Bumps the versions of all databag entries.
 Performs a berks install on all cookbooks in the chef repo.
 
 ### Promote:upload_cookbooks
-Uploads all cookbooks to the chef server. **Note**: only cookbooks that have been bumped will be uploaded. Uploaded cookbooks are frozen.
+Uploads all cookbook versions of an environment to the chef server. **Note**: only cookbooks that have been bumped will be uploaded. Uploaded cookbooks are frozen.
 
 ### Promote:upload_environment
 Uploads an environment file to the chef server

data/lib/promote.rb

@@ -1,4 +1,5 @@
 require 'promote/config'
+require 'promote/environment_file'
 require 'promote/git_helper'
 require 'promote/uploader'
 require 'promote/versioner'

data/lib/promote/environment_file.rb

@@ -0,0 +1,38 @@
+require 'json'
+
+module Promote
+  class EnvironmentFile
+    attr_accessor :name
+
+    def initialize(environment_name, config)
+      @name = environment_name
+      @config = config
+    end
+
+    def file_path
+      File.join(@config.environment_directory, "#{name}.json")
+    end
+
+    def cookbook_versions
+      content.has_key?('cookbook_versions') ? content['cookbook_versions'] : {}
+    end
+
+    def write_cookbook_versions(versions)
+      content['cookbook_versions'] = versions
+
+      File.open(file_path, 'w') do |out|
+        out << JSON.pretty_generate(content)
+      end
+    end
+
+    private
+
+    def content
+      @content ||= get_environment_content
+    end
+
+    def get_environment_content
+      JSON.parse(File.read(file_path))
+    end
+  end
+end

data/lib/promote/promoter.rb

@@ -9,17 +9,10 @@ module Promote
     end
 
     def promote_to(source_environment, destination_environment)
-      source_file = File.join(config.environment_directory, "#{source_environment}.json")
-      dest_file = File.join(config.environment_directory, "#{destination_environment}.json")
+      source = EnvironmentFile.new(source_environment, config)
+      dest = EnvironmentFile.new(destination_environment, config)
       
-      source_content = JSON.parse(File.read(source_file))
-      dest_content = JSON.parse(File.read(dest_file))
-      
-      dest_content['cookbook_versions'] = source_content['cookbook_versions']
-
-      File.open(dest_file, 'w') do |out|
-        out << JSON.pretty_generate(dest_content)
-      end
+      dest.write_cookbook_versions(source.cookbook_versions)
     end
 
     def stage_promotion(promote_environment, destination_config, ui)
@@ -35,8 +28,8 @@ module Promote
 
       ui.info "Downloading cookbooks..."
       server_versions = Promote::Utils.chef_server_cookbooks(destination_config)
-      env_content = JSON.parse(File.read(File.join(config.temp_directory, deploy_file)))
-      env_content['cookbook_versions'].each do |k,v|
+      env_content = EnvironmentFile.new(promote_environment, Config.new({:repo_root => config.temp_directory}))
+      env_content.cookbook_versions.each do |k,v|
         if !server_versions.has_key?(k) || (server_versions[k]["versions"].select {|version| version['version'] == v}).empty?
           ui.info "#{k}-#{v}"
           download_files(config.temp_directory, "/cookbooks/#{k}", v)

data/lib/promote/rake_tasks.rb

@@ -126,10 +126,10 @@ module Promote
 
     def define_upload_cookbooks
       namespace "Promote" do
-        desc "Upload all cookbooks to chef server"
-        task "upload_cookbooks" do
+        desc "Upload all cookbooks in an environment to the chef server"
+        task "upload_cookbooks", :environment do |task, args|
           puts "Uploading cookbooks not already on server..."
-          @uploader.upload_cookbooks
+          @uploader.upload_cookbooks(args.environment)
         end
       end
     end

data/lib/promote/uploader.rb

@@ -22,30 +22,28 @@ module Promote
       Chef::Config[:chef_repo_path] = config.repo_root
     end
 
-    def upload_cookbooks
-      nothing_to_upload = true
+    def upload_cookbooks(environment)
+      anything_to_upload = false
       server_cookbooks = Utils.chef_server_cookbooks(config)
       FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
       Dir.mkdir(config.temp_directory)
+
+      env_versions = EnvironmentFile.new(environment, config).cookbook_versions
       Dir.glob(File.expand_path("~/.berkshelf/cookbooks/*")).each do | dir |
         cp_name = File.basename(dir)
         idx = cp_name.rindex('-')
-        if !server_cookbooks.has_key?(cp_name[0,idx]) || (server_cookbooks[cp_name[0,idx]]["versions"].select {|v| v['version'] == cp_name[idx+1,cp_name.length-idx]}).empty?
-          FileUtils.copy_entry(dir, File.join(config.temp_directory, cp_name[0,idx]))
-          nothing_to_upload = false
-        end
+        cb_name = cp_name[0,idx]
+        cb_version = cp_name[idx+1,cp_name.length-idx]
+        anything_to_upload = cookbooks_copied?(cb_name, cb_version, dir, server_cookbooks, env_versions)
       end
 
       Dir.glob(File.join(config.cookbook_directory, "*")).each do | dir |
         metadata = Chef::Cookbook::Metadata.new
         metadata.from_file(File.join(dir, "metadata.rb"))
-        if !server_cookbooks.has_key?(metadata.name) || (server_cookbooks[metadata.name]["versions"].select {|v| v['version'] == metadata.version}).empty?
-          FileUtils.copy_entry(dir, File.join(config.temp_directory, metadata.name))
-          nothing_to_upload = false
-        end
+        anything_to_upload = cookbooks_copied?(metadata.name, metadata.version, dir, server_cookbooks, env_versions) || anything_to_upload
       end
 
-      if !nothing_to_upload
+      if anything_to_upload
         upload_cookbook_directory(config.temp_directory)
       end
     end
@@ -72,6 +70,16 @@ module Promote
 
     private
 
+    #only include versions in environment but exclude whats on the server
+    def cookbooks_copied?(name, version, dir, server_cookbooks, environment_cookbooks)
+      if !server_cookbooks.has_key?(name) || (server_cookbooks[name]["versions"].select {|v| v['version'] == version}).empty?
+        if environment_cookbooks.has_key?(name) && environment_cookbooks[name] == version
+          FileUtils.copy_entry(dir, File.join(config.temp_directory, name))
+          true
+        end
+      end
+    end
+
     def upload_file(file_path)
       fs_config = Chef::ChefFS::Config.new
       pattern = Chef::ChefFS::FilePattern.new(file_path)

data/lib/promote/versioner.rb

@@ -92,16 +92,13 @@ module Promote
 
     def constrain_environment(environment_name, cookbook_name)
       dependencies = environment_dependencies(cookbook_name)
-      env_file = File.join(config.environment_directory, "#{environment_name}.json")
-      content = JSON.parse(File.read(env_file))
-      content['cookbook_versions'] = {}
+      env_file = EnvironmentFile.new(environment_name, config)
+      versions = {}
       dependencies.each do | dep |
-        content['cookbook_versions'][dep.name] = dep.locked_version.to_s
+        versions[dep.name] = dep.locked_version.to_s
       end
 
-      File.open(env_file, 'w') do |out|
-        out << JSON.pretty_generate(content)
-      end
+      env_file.write_cookbook_versions(versions)
       dependencies
     end
 
@@ -109,10 +106,9 @@ module Promote
       dependencies = environment_dependencies(environment_cookbook)
       cb_dependency = (dependencies.select { |dep| dep.name == cookbook_name })[0]
 
-      env_file = File.join(config.environment_directory, "#{environment_name}.json")
-      content = JSON.parse(File.read(env_file))
-      if content.has_key?('cookbook_versions') && content['cookbook_versions'].has_key?(cookbook_name)
-        return cb_dependency.locked_version.to_s != content['cookbook_versions'][cookbook_name]
+      env_file = EnvironmentFile.new(environment_name, config)
+      if env_file.cookbook_versions.has_key?(cookbook_name)
+        return cb_dependency.locked_version.to_s != env_file.cookbook_versions[cookbook_name]
       else
         return true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -115,6 +115,7 @@ files:
 - lib/chef/knife/promote.rb
 - lib/promote.rb
 - lib/promote/config.rb
+- lib/promote/environment_file.rb
 - lib/promote/git_helper.rb
 - lib/promote/promoter.rb
 - lib/promote/rake_tasks.rb