clc-promote 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0a71a3fcad72dd64f5a17a5697ac0f9e2ad9d3
-  data.tar.gz: 21f7a69d62f5a17ac227d84a780eb926acfa7bcb
+  metadata.gz: fe800d49579f78d5f25faf255f23d48415f153c0
+  data.tar.gz: bf16f163d2d0e64d93988d66164e4acdaacc9b81
 SHA512:
-  metadata.gz: a0223ecfd085ddfc069f88dfb3e8655a386866b0a108b1c122db9c9698e0620027ab6b49b35eb7bee5abf27716153297b4e4480a4145ce148758d56ce64e5300
-  data.tar.gz: f2b82702ca79dc2f05b34b51520b64991e7f706c12c17b4db1476c9fd118031083f6943437760c30d6983cfc2593f17aba48a5bda40f914224942d8d263aa7a5
+  metadata.gz: 95aab19d63d79dddfbe748a8ed13f295a2d13951740b8c28ecfb780c1cd58ff2c04ecf7f25a6ed522545e197cb25dc8d2123cb80bf0b662cefd335578fdf996c
+  data.tar.gz: d578a8370523bf53ca4b32bec9c4167b6b44b760434f56d2cfb86440cedf723d05f9677e8a4db90ccc5f59d84b15d33564bd65666d9d28ba63c4d445e800b955

data/lib/promote.rb

@@ -1 +1,3 @@
-require 'promote/versioner'
+require 'promote/config'
+require 'promote/uploader'
+require 'promote/versioner'

data/lib/promote/config.rb

@@ -0,0 +1,23 @@
+module Promote
+  class Config
+    def initialize(options = {})
+      options.each do |k, v|
+      	self.send("#{k}=", v) if self.respond_to?(k) 
+      end
+      self.repo_root ||= Dir.pwd
+      self.cookbook_directory ||= File.join(repo_root, "cookbooks")
+      self.environment_directory ||= File.join(repo_root, "environments")
+      self.data_bag_directory ||= File.join(repo_root, "data_bags")
+      self.temp_directory ||= "/tmp/promote"
+    end
+
+    attr_accessor :repo_root
+    attr_accessor :cookbook_directory
+    attr_accessor :environment_directory
+    attr_accessor :data_bag_directory
+    attr_accessor :temp_directory
+    attr_accessor :node_name
+    attr_accessor :client_key
+    attr_accessor :chef_server_url
+  end
+end

data/lib/promote/rake_tasks.rb

@@ -5,8 +5,10 @@ module Promote
 
   class RakeTasks < ::Rake::TaskLib
 
-    def initialize(repo_root)
-      @versioner = Versioner.new(repo_root)
+    def initialize(config)
+      config = Config.new(config) if config.is_a?(Hash)
+      config = Config.new({ :repo_root => config }) if config.is_a?(String)
+      @versioner = Versioner.new(config)
       yield self if block_given?
       define_version_cookbook
       define_version_cookbooks
@@ -79,5 +81,16 @@ module Promote
       end
     end
 
+    def define_upload_cookbooks
+      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
+        end
+      end
+    end
+
   end
 end

data/lib/promote/uploader.rb

@@ -0,0 +1,47 @@
+require 'chef'
+require 'chef/knife/cookbook_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
+    
+    attr_accessor :config
+
+    private
+
+    def validate_config
+      required_keys = [:client_key, :chef_server_url, :node_name]
+      missing_keys = []
+      required_keys.each do |key|
+        missing_keys << key if config.send(key).nil?
+      end
+
+      unless missing_keys.empty?
+        raise "missing required config options: #{missing_keys.join(', ')}"
+      end
+    end
+  end
+end

data/lib/promote/versioner.rb

@@ -4,16 +4,16 @@ require 'json'
 
 module Promote
   class Versioner
-    def initialize(repo_root = Dir.pwd)
-      @repo_root = repo_root
-      @git = Git.open(git_root(repo_root))
+    def initialize(config = Config.new)
+      @config = config
+      @git = Git.open(git_root(config.repo_root))
       version_tags = @git.tags.select { |t| t.name[/^[0-9\.]+/] }
       @current_tag = version_tags[-1]
       @sha1 = @git.log(10000).between(current_tag.sha).first.sha
     end
 
     def version_cookbook(cookbook_name)
-      dir = File.join(cookbook_directory, cookbook_name)
+      dir = File.join(config.cookbook_directory, cookbook_name)
       cookbook_name = File.basename(dir)
       version = version_number(current_tag, dir)
       metadata_file = File.join(dir, "metadata.rb")
@@ -35,7 +35,7 @@ module Promote
     end
 
     def version_cookbooks
-      cookbooks = Dir.glob(File.join(cookbook_directory, "*"))
+      cookbooks = Dir.glob(File.join(config.cookbook_directory, "*"))
       results = []
       cookbooks.each do |file|
         cookbook = File.basename(file)
@@ -45,7 +45,7 @@ module Promote
         end
       end
       cookbooks.each do |cookbook|
-        berks_name = File.join(cookbook_directory, File.basename(cookbook), "Berksfile")
+        berks_name = File.join(config.cookbook_directory, File.basename(cookbook), "Berksfile")
         if File.exist?(berks_name)
           berksfile = Berkshelf::Berksfile.from_file(berks_name)
           berksfile.install
@@ -54,15 +54,14 @@ module Promote
       results
     end
 
-    def version_data_bag(data_bag_name)
-      version_json data_bag_directory, data_bag_name
+    def version_data_bag(data_bag_path)
+      version_json File.dirname(data_bag_path), File.basename(data_bag_path, File.extname(data_bag_path))
     end
 
     def version_data_bags
       results = []
-      Dir.glob(File.join(data_bag_directory, "**", "*.json")).each do |file|
-        data_bag = File.basename(file, File.extname(file))
-        result = version_data_bag(data_bag)
+      Dir.glob(File.join(config.data_bag_directory, "**", "*.json")).each do |file|
+        result = version_data_bag(file)
         if !result.nil?
           results << result
         end
@@ -71,14 +70,14 @@ module Promote
     end
 
     def version_environment(environment_name)
-      version_json environment_directory, environment_name do | content | 
+      version_json config.environment_directory, environment_name do | content | 
         content['override_attributes']
       end
     end
 
     def version_environments
       results = []
-      Dir.glob(File.join(environment_directory, "*.json")).each do |file|
+      Dir.glob(File.join(config.environment_directory, "*.json")).each do |file|
         environment = File.basename(file ,File.extname(file))
         result = version_environment(environment)
         if !result.nil?
@@ -88,17 +87,7 @@ module Promote
       results
     end
 
-    def cookbook_directory
-      File.join(@repo_root, "cookbooks")
-    end
-
-    def environment_directory
-      File.join(@repo_root, "environments")
-    end
-
-    def data_bag_directory
-      File.join(@repo_root, "data_bags/datacenters")
-    end
+    attr_accessor :config
 
     private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-spork
@@ -119,7 +119,9 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/promote.rb
+- lib/promote/config.rb
 - lib/promote/rake_tasks.rb
+- lib/promote/uploader.rb
 - lib/promote/versioner.rb
 homepage: https://github.com/tier3/DevOps/gems/clc-promote
 licenses: []