clc-promote 0.1.4 → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe800d49579f78d5f25faf255f23d48415f153c0
-  data.tar.gz: bf16f163d2d0e64d93988d66164e4acdaacc9b81
+  metadata.gz: 24e8944f0082aa895bf69fff09a1016943e6b212
+  data.tar.gz: c5e93da8c48ae3507e421ddd4a1185d4bdba2b31
 SHA512:
-  metadata.gz: 95aab19d63d79dddfbe748a8ed13f295a2d13951740b8c28ecfb780c1cd58ff2c04ecf7f25a6ed522545e197cb25dc8d2123cb80bf0b662cefd335578fdf996c
-  data.tar.gz: d578a8370523bf53ca4b32bec9c4167b6b44b760434f56d2cfb86440cedf723d05f9677e8a4db90ccc5f59d84b15d33564bd65666d9d28ba63c4d445e800b955
+  metadata.gz: cfe6919ce0b01abdb44b7cfb777b3e5ad5fa5108295e44c38a5d183220be94d7548348e5e728686fd015ae779a7abc341aa4edb768da06b50d16ea0e014f0fc5
+  data.tar.gz: 833b9efee560ff24642a3d624638a799e31cb83a5f91ea1c3dffd43bf074f6a9d05545c5e718fd32e3adb7113abc51d2ace8f4aac03c74b8a941111c0d75d702

data/lib/promote/rake_tasks.rb

@@ -9,6 +9,7 @@ module Promote
       config = Config.new(config) if config.is_a?(Hash)
       config = Config.new({ :repo_root => config }) if config.is_a?(String)
       @versioner = Versioner.new(config)
+      @uploader = Uploader.new(config)
       yield self if block_given?
       define_version_cookbook
       define_version_cookbooks
@@ -16,6 +17,10 @@ module Promote
       define_version_environments
       define_version_data_bag
       define_version_data_bags
+      define_upload_cookbooks
+      define_upload_environment
+      define_upload_data_bags
+      define_constrain_environment
     end
 
     private
@@ -34,6 +39,7 @@ module Promote
       namespace "Promote" do
         desc "Version all cookbooks"
         task "version_cookbooks" do
+          puts "Version stamping cookbooks and syncing berksfile.locks..."
           @versioner.version_cookbooks.each do |result|
             puts "Versioned cookbook: #{result[:cookbook]} v#{result[:version]}"
           end
@@ -50,10 +56,24 @@ module Promote
       end
     end
 
+    def define_constrain_environment
+      namespace "Promote" do
+        desc "Constrain the cookbook versions of an environment"
+        task "constrain_environment", :environment, :environment_cookbook do |task, args|
+          puts "Checking for cookbok constraints for the #{args.environment} environment using the #{args.environment_cookbook} cookbook..."
+          deps = @versioner.constrain_environment(args.environment, args.environment_cookbook)
+          deps.each do |dep|
+            puts "#{dep.name} -> #{dep.locked_version.to_s}"
+          end
+        end
+      end
+    end
+
     def define_version_environments
       namespace "Promote" do
         desc "Version all environments"
         task "version_environments" do
+          puts "Version stamping changed environments..."
           @versioner.version_environments.each do |result|
             puts "Versioned environment: #{result[:artifact]} v#{result[:version]}"
           end
@@ -74,6 +94,7 @@ module Promote
       namespace "Promote" do
         desc "Version all data_bags"
         task "version_data_bags" do
+          puts "Version stamping changed data_bags..."
           @versioner.version_data_bags.each do |result|
             puts "Versioned data_bag: #{result[:artifact]} v#{result[:version]}"
           end
@@ -85,9 +106,28 @@ module Promote
       namespace "Promote" do
         desc "Upload all cookbooks to chef server"
         task "upload_cookbooks" do
-          @uploader.upload_cookbooks.each do |result|
-            #puts "Versioned cookbook: #{result[:cookbook]} v#{result[:version]}"
-          end
+          puts "Uploading cookbooks not already on server..."
+          @uploader.upload_cookbooks
+        end
+      end
+    end
+
+    def define_upload_environment
+      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)
+        end
+      end
+    end
+
+    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
         end
       end
     end

data/lib/promote/uploader.rb

@@ -1,33 +1,76 @@
 require 'chef'
+require 'chef/chef_fs/knife'
+require 'chef/chef_fs/parallelizer'
+require 'chef/chef_fs/config'
+require 'chef/chef_fs/file_pattern'
+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
     def initialize(config)
       @config = config
       validate_config
-    end
-
-    def upload_cookbook(cookbook_name)
-      berks_name = File.join(config.cookbook_directory, cookbook_name, "Berksfile")
-      upload_dir = config.cookbook_directory
-      if File.exist?(berks_name)
-        FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
-        berksfile = Berkshelf::Berksfile.from_file(berks_name)
-        berksfile.vendor(config.temp_directory)
-        upload_dir = config.temp_directory
-      end
-
-      knife = Chef::Knife::CookbookUpload.new()
       Chef::Config.reset
       Chef::Config[:client_key] = config.client_key
       Chef::Config[:chef_server_url] = config.chef_server_url
       Chef::Config[:node_name] = config.node_name
-      knife.config[:all] = true
-      knife.config[:cookbook_path] = upload_dir
-      knife.run
     end
-    
+
+    def upload_cookbooks
+      nothing_to_upload = true
+      rest = Chef::REST.new(config.chef_server_url, config.node_name, config.client_key)
+      server_cookbooks = rest.get_rest("/cookbooks?num_versions=all")
+      FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
+      Dir.mkdir(config.temp_directory)
+      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
+      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
+      end
+
+      if !nothing_to_upload
+        knife = Chef::Knife::CookbookUpload.new()
+        knife.config[:all] = true
+        knife.config[:freeze] = true      
+        knife.config[:cookbook_path] = config.temp_directory
+        knife.run
+      end
+    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
+    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
+    end
+
     attr_accessor :config
 
     private

data/lib/promote/versioner.rb

@@ -47,6 +47,7 @@ module Promote
       cookbooks.each do |cookbook|
         berks_name = File.join(config.cookbook_directory, File.basename(cookbook), "Berksfile")
         if File.exist?(berks_name)
+          Berkshelf.set_format :null
           berksfile = Berkshelf::Berksfile.from_file(berks_name)
           berksfile.install
         end
@@ -87,6 +88,23 @@ module Promote
       results
     end
 
+    def constrain_environment(environment_name, cookbook_name)
+      berks_name = File.join(config.cookbook_directory, cookbook_name, "Berksfile")
+      berksfile = Berkshelf::Berksfile.from_file(berks_name)
+      dependencies = berksfile.list
+      env_file = File.join(config.environment_directory, "#{environment_name}.json")
+      content = JSON.parse(File.read(env_file))
+      content['cookbook_versions'] = {}
+      dependencies.each do | dep |
+        content['cookbook_versions'][dep.name] = dep.locked_version.to_s
+      end
+
+      File.open(env_file, 'w') do |out|
+        out << JSON.pretty_generate(content)
+      end
+      dependencies
+    end
+
     attr_accessor :config
 
     private

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: knife-spork
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -137,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1