clc-promote 0.4.0.dev.15 → 0.4.0.dev.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fbec88c6ee783cfda0c4dde10e77efe5158cdd4
-  data.tar.gz: e409cf9cf81cd1a632e41755f355398d9e8f9d89
+  metadata.gz: 24a8ea1aec1e9dd86817d1eb9c74051e26329491
+  data.tar.gz: a1ba2706c78a8b4e6be0a1aa806919b0e54c18f4
 SHA512:
-  metadata.gz: ae4afb75ef882b373ebd7e8614dde5bfbd9acf6544902518533ce5ea4dc469c80622b4c999733cf18b48d37007f036393f3ee81014523e5a22eb6e563a7aec24
-  data.tar.gz: c157119d21822944b319a74cbefdfd9aa7d4b657e8235f8a938b65e8ca1c6060f06df006f61d6b7292f60c1c354a8fa7894d15299e13829031ab73f9c5736f07
+  metadata.gz: d2289943c16adc648ca954430e775441df4e84cdd81d0e424d1a6b204937fd7869210f84405467f978f2329ecc4cd8014b9b508c3276c6cee28e6341c512a7a6
+  data.tar.gz: 3ed76680c8c3a07cd6162a45803a126a9e3b5320fa7d83e1df887385f3e38bf0c000849fce98bf45d84ec6b9d219cf906cc9c30c6a382909c952da96c8142aa7

data/lib/promote.rb

@@ -1,4 +1,5 @@
 require 'promote/config'
+require 'promote/cookbook'
 require 'promote/environment_file'
 require 'promote/git_repo'
 require 'promote/uploader'

data/lib/promote/cookbook.rb

@@ -0,0 +1,114 @@
+require 'berkshelf'
+require 'json'
+
+module Promote
+  class Cookbook
+    def initialize(cookbook_name, config)
+      @name = cookbook_name
+      @config = config
+      @metadata_path = File.join(path, 'metadata.rb')
+      @berks_path = File.join(path, "Berksfile")
+    end
+
+    def dependencies
+      @dependencies ||= get_dependencies_from_lockfile
+    end
+
+    def metadata_dependencies
+      metadata.dependencies
+    end
+
+    def version(version=nil)
+      metadata.version
+    end
+
+    def version=(version)
+      version_line = raw_metadata[/^\s*version\s.*$/]
+      current_version = version_line[/('|").*("|')/].gsub(/('|")/,"")
+      if current_version != version.to_s
+        new_version_line = version_line.gsub(current_version, version.to_s)
+        new_content = raw_metadata.gsub(version_line, new_version_line)
+        save_metadata(new_content)
+      end
+      version
+    end
+
+    def stamp_commit(commit)
+      commit_line = "#sha1 '#{commit}'"
+      new_content = raw_metadata.gsub(/#sha1.*$/, commit_line)
+      if new_content[/#sha1.*$/].nil?
+        new_content += "\n#{commit_line}"
+      end
+      save_metadata(new_content)
+    end
+
+    def raw_metadata
+      @raw_metadata ||= File.read(@metadata_path)
+    end
+
+    def metadata
+      @metadata ||=get_metadata_from_file
+    end
+
+    def path
+      File.join(@config.cookbook_directory, @name)
+    end
+
+    def sync_berksfile(update=false)
+      return if berksfile.nil?
+
+      update = false unless File.exist?("#{@berks_path}.lock")
+      update ? berksfile.update : berksfile.install
+    end
+
+    def sync_latest_app_cookbooks(environment_cookbook_name)
+      result = {}
+      latest_server_cookbooks = Utils.chef_server_cookbooks(@config, 1)
+      env_cookbook = Cookbook.new(environment_cookbook_name, @config)
+      env_cookbook.metadata_dependencies do |key|
+        latest_version = latest_server_cookbooks[key]['versions'][0]
+        if dependencies.keys.include?(key) && latest_version > dependencies[key].to_s
+          berksfile.update(key)
+          result[key] = latest_version
+        end
+      end
+      @dependencies = nil unless result.keys.empty?
+      result
+    end
+
+    private
+
+    def berksfile
+      @berksfile ||= get_berksfile
+    end
+
+    def save_metadata(content)
+      File.open(@metadata_path, 'w') do |out|
+        out << content
+      end
+      @metadata=nil
+      @raw_metadata = nil
+    end
+
+    def get_metadata_from_file
+      metadata = Chef::Cookbook::Metadata.new
+      metadata.from_file(@metadata_path)
+      metadata
+    end
+
+    def get_dependencies_from_lockfile
+      berksfile.install
+      berks_deps = berksfile.list
+      deps = {}
+
+      berks_deps.each {|dep| deps[dep.name] = dep.locked_version}
+      deps
+    end
+
+    def get_berksfile
+      return unless File.exist?(@berks_path)
+      Berkshelf.set_format :null
+      Berkshelf::Berksfile.from_file(@berks_path)
+    end
+  end
+end

data/lib/promote/git_repo.rb

@@ -53,6 +53,7 @@ module Promote
     end
 
     def git_root(start_leaf)
+      raise "no git repo found for #{scope_path}" if start_leaf == '/'
       return start_leaf if File.exist?(File.join(start_leaf, '.git'))
       git_root(File.expand_path('..', start_leaf))
     end

data/lib/promote/rake_tasks.rb

@@ -6,11 +6,11 @@ module Promote
   class RakeTasks < ::Rake::TaskLib
 
     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)
-      @uploader = Uploader.new(config)
-      @promoter = Promoter.new(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)
+      @uploader = Uploader.new(@config)
+      @promoter = Promoter.new(@config)
       yield self if block_given?
       define_version_cookbook
       define_version_cookbooks
@@ -54,7 +54,7 @@ module Promote
         desc "Syncs a Berksfile.lock file"
         task "sync_berksfile", :cookbook, :update do |task, args|
           puts "Syncing berksfile.lock for #{args.cookbook}..."
-          @versioner.sync_berksfile(args.cookbook, args.update)
+          Cookbook.new(args.cookbook, @config).sync_berksfile(args.update)
         end
       end
     end
@@ -64,7 +64,7 @@ module Promote
         desc "Syncs all Berksfile.lock files"
         task "sync_berksfiles" do
           puts "Syncing berksfile.locks..."
-          @versioner.sync_berksfiles
+          Utils.sync_berksfiles(@config)
         end
       end
     end
@@ -84,8 +84,8 @@ module Promote
         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}"
+          deps.each do |k,v|
+            puts "#{k} -> #{v}"
           end
         end
       end

data/lib/promote/utils.rb

@@ -2,25 +2,15 @@ require 'chef'
 
 module Promote
   class Utils
-    def self.chef_server_cookbooks(config)
+    def self.chef_server_cookbooks(config, versions = 'all')
       rest = Chef::REST.new(config.chef_server_url, config.node_name, config.client_key)
-      rest.get_rest("/cookbooks?num_versions=all")
+      rest.get_rest("/cookbooks?num_versions=#{versions}")
     end
 
-    def self.sync_berksfiles(cookbook_directory, update)
-      repo_cookbooks = Dir.glob(File.join(cookbook_directory, "*"))
+    def self.sync_berksfiles(config, update = false)
+      repo_cookbooks = Dir.glob(File.join(config.cookbook_directory, "*"))
       repo_cookbooks.each do |cookbook|
-        sync_berksfile(cookbook, update)
-      end
-    end
-
-    def self.sync_berksfile(cookbook_root, update)
-      berks_name = File.join(cookbook_root, "Berksfile")
-      if File.exist?(berks_name)
-        update = false unless File.exist?("#{berks_name}.lock")
-        Berkshelf.set_format :null
-        berksfile = Berkshelf::Berksfile.from_file(berks_name)
-        update ? berksfile.update : berksfile.install
+        Cookbook.new(File.basename(cookbook), config).sync_berksfile(update)
       end
     end
   end

data/lib/promote/versioner.rb

@@ -1,4 +1,3 @@
-require 'berkshelf'
 require 'json'
 
 module Promote
@@ -8,23 +7,12 @@ module Promote
     end
 
     def version_cookbook(cookbook_name)
-      dir = File.join(config.cookbook_directory, cookbook_name)
-      repo = GitRepo.new(dir)
-      cookbook_name = File.basename(dir)
+      cookbook = Cookbook.new(cookbook_name, config)
+      repo = GitRepo.new(cookbook.path)
       version = repo.version_number
-      metadata_file = File.join(dir, "metadata.rb")
-      metadata_content = File.read(metadata_file)
-      version_line = metadata_content[/^\s*version\s.*$/]
-      current_version = version_line[/('|").*("|')/].gsub(/('|")/,"")
-      if current_version != version
-        metadata_content = metadata_content.gsub(current_version, version)
-        outdata = metadata_content.gsub(/#sha1.*$/, "#sha1 '#{repo.sha1}'")
-        if outdata[/#sha1.*$/].nil?
-          outdata += "#sha1 '#{repo.sha1}'"
-        end
-        File.open(metadata_file, 'w') do |out|
-          out << outdata
-        end
+      if cookbook.version.to_s != version
+        cookbook.version = Semverse::Version.new(version)
+        cookbook.stamp_commit(repo.sha1)
         return { 
           :cookbook => cookbook_name, 
           :version => version, 
@@ -36,8 +24,7 @@ module Promote
     def version_cookbooks
       results = []
       Dir.glob(File.join(config.cookbook_directory, "*")).each do |file|
-        cookbook = File.basename(file)
-        result = version_cookbook(cookbook)
+        result = version_cookbook(File.basename(file))
         if !result.nil?
           results << result
         end
@@ -45,14 +32,6 @@ module Promote
       results
     end
 
-    def sync_berksfile(cookbook_name, update = false)
-      Utils.sync_berksfile(File.join(config.cookbook_directory, cookbook_name), update)
-    end
-
-    def sync_berksfiles(update = false)
-      Utils.sync_berksfiles(config.cookbook_directory, update)
-    end
-
     def version_environment(environment_name)
       version_json config.environment_directory, environment_name do | content |
         content['override_attributes']
@@ -62,8 +41,7 @@ module Promote
     def version_environments
       results = []
       Dir.glob(File.join(config.environment_directory, "*.json")).each do |file|
-        environment = File.basename(file ,File.extname(file))
-        result = version_environment(environment)
+        result = version_environment(File.basename(file ,File.extname(file)))
         if !result.nil?
           results << result
         end
@@ -72,14 +50,9 @@ module Promote
     end
 
     def constrain_environment(environment_name, cookbook_name)
-      dependencies = environment_dependencies(cookbook_name)
+      dependencies = Cookbook.new(cookbook_name, config).dependencies
       env_file = EnvironmentFile.new(environment_name, config)
-      versions = {}
-      dependencies.each do | dep |
-        versions[dep.name] = dep.locked_version.to_s
-      end
-
-      env_file.write_cookbook_versions(versions)
+      env_file.write_cookbook_versions(dependencies)
       dependencies
     end
 
@@ -95,13 +68,6 @@ module Promote
 
     private
 
-    def environment_dependencies(cookbook_name)
-      berks_name = File.join(config.cookbook_directory, cookbook_name, "Berksfile")
-      berksfile = Berkshelf::Berksfile.from_file(berks_name)
-      berksfile.install
-      berksfile.list
-    end
-
     def version_json(parent_directory, file_name, &block)
       version_string = "version"
       file = "#{parent_directory}/#{file_name}.json"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.4.0.dev.15
+  version: 0.4.0.dev.16
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: clc-git
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +101,7 @@ files:
 - lib/chef/knife/promote.rb
 - lib/promote.rb
 - lib/promote/config.rb
+- lib/promote/cookbook.rb
 - lib/promote/environment_file.rb
 - lib/promote/git_repo.rb
 - lib/promote/promoter.rb