clc-promote 0.2.0.pre → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e8944f0082aa895bf69fff09a1016943e6b212
-  data.tar.gz: c5e93da8c48ae3507e421ddd4a1185d4bdba2b31
+  metadata.gz: e687f6bcfc1d904507cbee41f0191181eed28273
+  data.tar.gz: 6476cbbfc08c6554abd65bf594c18f50e8ff2a68
 SHA512:
-  metadata.gz: cfe6919ce0b01abdb44b7cfb777b3e5ad5fa5108295e44c38a5d183220be94d7548348e5e728686fd015ae779a7abc341aa4edb768da06b50d16ea0e014f0fc5
-  data.tar.gz: 833b9efee560ff24642a3d624638a799e31cb83a5f91ea1c3dffd43bf074f6a9d05545c5e718fd32e3adb7113abc51d2ace8f4aac03c74b8a941111c0d75d702
+  metadata.gz: b205d382415d921d2e297084516662ca2a6ab790dfdc815fbc801ad181ee0c406d61052d0e7210c8b36586305e131ee38456c84500b4983ea324f3259ab62686
+  data.tar.gz: 95b580aa5bc01e973620428dcda740369b91eee832a1d016d1ceb52e8c27dd91d111a4a31058b37a630f10f65e8f697e60252426ab364ede0a4eafc031c5229a

data/lib/promote/rake_tasks.rb

@@ -17,6 +17,7 @@ module Promote
       define_version_environments
       define_version_data_bag
       define_version_data_bags
+      define_sync_berksfiles
       define_upload_cookbooks
       define_upload_environment
       define_upload_data_bags
@@ -25,7 +26,6 @@ module Promote
 
     private
 
-
     def define_version_cookbook
       namespace "Promote" do
         desc "Version a cookbook"
@@ -39,7 +39,7 @@ module Promote
       namespace "Promote" do
         desc "Version all cookbooks"
         task "version_cookbooks" do
-          puts "Version stamping cookbooks and syncing berksfile.locks..."
+          puts "Version stamping cookbooks..."
           @versioner.version_cookbooks.each do |result|
             puts "Versioned cookbook: #{result[:cookbook]} v#{result[:version]}"
           end
@@ -47,6 +47,16 @@ module Promote
       end
     end
 
+    def define_sync_berksfiles
+      namespace "Promote" do
+        desc "Syncs all Berksfile.lock files"
+        task "sync_berksfiles" do
+          puts "Syncing berksfile.locks..."
+          @versioner.sync_berksfiles
+        end
+      end
+    end
+
     def define_version_environment
       namespace "Promote" do
         desc "Version an environment"

data/lib/promote/versioner.rb

@@ -35,16 +35,19 @@ module Promote
     end
 
     def version_cookbooks
-      cookbooks = Dir.glob(File.join(config.cookbook_directory, "*"))
       results = []
-      cookbooks.each do |file|
+      repo_cookbooks.each do |file|
         cookbook = File.basename(file)
         result = version_cookbook(cookbook)
         if !result.nil?
           results << result
         end
       end
-      cookbooks.each do |cookbook|
+      results
+    end
+
+    def sync_berksfiles
+      repo_cookbooks.each do |cookbook|
         berks_name = File.join(config.cookbook_directory, File.basename(cookbook), "Berksfile")
         if File.exist?(berks_name)
           Berkshelf.set_format :null
@@ -52,7 +55,6 @@ module Promote
           berksfile.install
         end
       end
-      results
     end
 
     def version_data_bag(data_bag_path)
@@ -89,9 +91,7 @@ module Promote
     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
+      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'] = {}
@@ -99,16 +99,40 @@ 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
       dependencies
     end
 
+    def is_dirty(environment_name, cookbook_name, environment_cookbook)
+      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]
+      else
+        return true
+      end
+    end
+
     attr_accessor :config
 
     private
 
+    def environment_dependencies(cookbook_name)
+      berks_name = File.join(config.cookbook_directory, cookbook_name, "Berksfile")
+      berksfile = Berkshelf::Berksfile.from_file(berks_name)
+      berksfile.list
+    end
+
+    def repo_cookbooks
+      Dir.glob(File.join(config.cookbook_directory, "*"))
+    end
+
     def version_json(parent_directory, file_name, &block)
       version_string = "version"
       file = "#{parent_directory}/#{file_name}.json"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.0
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -131,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1