dev-lxc 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4caf061044c84378f0ddc6f2b230bf471316bd
-  data.tar.gz: 38604c98358572ef9c01cdf0b5bb3c123d12909e
+  metadata.gz: 292b5df53d047927c96eb8d73e13739b17c57c99
+  data.tar.gz: 3e696698a4ab38c75ef4cd428637b8ed95d21a6d
 SHA512:
-  metadata.gz: 3f21d2ec078c477fb6d1d3c2bed8329ecc2d09dba2f2f9e5f2683ca73fc7ae40b6992d687588b0478b5fc149e6e30c4fbd8323dcfa5ece1fb36d8224aea5881f
-  data.tar.gz: a4045af580cc0c357c6799ef29e4eb0b8785ec40a431897e63976b4cdd6394e26ebadebaaf08b763937118b54f9af3bb11a2d927193d6eb67d92f2585c7e8743
+  metadata.gz: 5f7bba6ca362e9f8de32c9702ebb9eca1af73f78f4049c63e39f1dd865423fb059f69ea9e4e67414d473fb35d181c9327a40e59fe38b80c5ced151abb2a24a15
+  data.tar.gz: 916d5ce93646952a3e69f858471a4dc837b01c3acc16a2e89b4d1c64f593fb2fc08fe2439620be12ab2c804aebb7353260df932711b0845ab194b9a98f853856

data/lib/dev-lxc/cli.rb

@@ -77,9 +77,10 @@ module DevLXC::CLI
 
     desc "chef-repo", "Creates a `bootstrap-node` script and chef-repo in the current directory using files from the cluster's backend /root/chef-repo"
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    option :force, :aliases => "-f", :type => :boolean, :desc => "Overwrite any existing knife.rb or pivotal.rb files"
     option :pivotal, :aliases => "-p", :type => :boolean, :desc => "Also copy pivotal.rb and pivotal.pem"
     def chef_repo
-      get_cluster(options[:config]).chef_repo(options[:pivotal])
+      get_cluster(options[:config]).chef_repo(options[:force], options[:pivotal])
     end
 
     desc "list_images [SERVER_NAME_REGEX]", "List of each servers' images created during the build process"

data/lib/dev-lxc/cluster.rb

@@ -58,7 +58,7 @@ module DevLXC
       servers = chef_servers + analytics_servers
     end
 
-    def chef_repo(copy_pivotal=false)
+    def chef_repo(force=false, pivotal=false)
       if @chef_server_bootstrap_backend.nil?
         puts "A bootstrap backend Chef Server is not defined in the cluster's config. Please define it first."
         exit 1
@@ -76,7 +76,7 @@ module DevLXC
       if pem_files.empty?
         puts "The pem files can not be copied because they do not exist in '#{chef_server.server.name}' Chef Server's `/root/chef-repo/.chef` directory"
       else
-        pem_files.delete_if { |pem_file| pem_file.end_with?("/pivotal.pem") } unless copy_pivotal
+        pem_files.delete_if { |pem_file| pem_file.end_with?("/pivotal.pem") } unless pivotal
         FileUtils.cp( pem_files, "./chef-repo/.chef" )
       end
 
@@ -88,8 +88,8 @@ module DevLXC
         chef_server_url = "https://#{@api_fqdn}/organizations/ponyville"
         validator_name = "ponyville-validator"
 
-        if copy_pivotal
-          if File.exists?("./chef-repo/.chef/pivotal.rb")
+        if pivotal
+          if File.exists?("./chef-repo/.chef/pivotal.rb") && ! force
             puts "Skipping pivotal.rb because it already exists in `./chef-repo/.chef`"
           else
             pivotal_rb_path = "#{chef_server.abspath('/root/chef-repo/.chef')}/pivotal.rb"
@@ -105,7 +105,7 @@ module DevLXC
         end
       end
 
-      if File.exists?("./chef-repo/.chef/knife.rb")
+      if File.exists?("./chef-repo/.chef/knife.rb") && ! force
         puts "Skipping knife.rb because it already exists in `./chef-repo/.chef`"
       else
         knife_rb_path = "#{chef_server.abspath('/root/chef-repo/.chef')}/knife.rb"

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler