berkflow 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c341823406e944b861468b054d7159d5122540
-  data.tar.gz: 84a1a355597ae2f81080a7af9cc2f4c032779a6a
+  metadata.gz: 24c520495a983a7e8d942ac01d9751077401f8a8
+  data.tar.gz: f8516a6f5e8b830d038da357cd48c6700c21d3c6
 SHA512:
-  metadata.gz: c128d37108060fdbf5d1116b64dcdb9462e6d2a84af40918d75305ca6583acc20c8dcb97f4a7c92586770fcb68466d397e8aa50609b7a0b6c8fa2927d18e8e89
-  data.tar.gz: 0434b8a4fb6fc9ccf54e300e30e555d0fe40892842fd5d02a9da74f22b11e6320b1613d046ee35cd7275484bee8aa5083561fcd208689fa2a7f49bd34be8f7be
+  metadata.gz: 5d5decb374e5d427e12ec9017c245edfd3b36c665376f03f302c2e1ca4da17675dc82c59a04cd5067524e342af2fb5ac5deaa8cc2b93bf23aa4747d08ad8ce20
+  data.tar.gz: 0cc37c202e129473cd32bfeaeb63c1ec6655ed0a69d0fcfd5b78650f8d8e23484f0ac62d8c6ae739a697683317cf82b1424f3a578ee413ed4e2cee5d1dde5197

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.7.0
+
+* Enhancements
+  * Add `--connect-attribute` flag (`-a`) to specify using public hostname or ipv4 when connecting to nodes
+
+* Bug Fixes
+  * Silence erroneous error and warning outputs
+
 # 0.6.3
 
 * Bug Fixes

data/README.md

@@ -6,11 +6,11 @@ A command line tool for managing Chef Environments using Berkshelf and the [Envi
 
 ## Requirements
 
-* [ChefDK](http://getchef.com/downloads/chef-dk) >= 0.2.0
+* [Chef-DK](https://downloads.chef.io/chef-dk/) >= 0.2.0
 
 ## Installation
 
-Install the [Chef-DK](http://getchef.com/downloads/chef-dk) and add it, and it's gem binaries directory to your path
+Install the [Chef-DK](https://downloads.chef.io/chef-dk/) and add it, and it's gem binaries directory to your path
 
     $ export PATH=/opt/chefdk/bin:$HOME/.chefdk/gem/ruby/2.1.0/bin:$PATH
 

data/lib/berkflow.rb

@@ -4,8 +4,27 @@ require 'ridley'
 require 'ridley-connectors'
 require 'berkshelf'
 
-Celluloid.logger.level = ::Logger::ERROR
-
 module Berkflow
-  # Your code goes here...
+  class << self
+    def debug?
+      !ENV['DEBUG'].nil?
+    end
+
+    def setup
+      if debug?
+        Ridley.logger.level    = Logger::DEBUG
+        Berkshelf.logger.level = Logger::DEBUG
+      else
+        # Disable Celluloid logging to silence erronous warnings and errors. This
+        # will be re-enabled in the future once the cause of false crash reports
+        # on shutdown is identified and fixed.
+        Celluloid.logger = nil
+
+        Ridley.logger.level    = Logger::ERROR
+        Berkshelf.logger.level = Logger::ERROR
+      end
+    end
+  end
 end
+
+Berkflow.setup

data/lib/berkflow/cli.rb

@@ -145,6 +145,12 @@ module Berkflow
       type: :boolean,
       desc: "Execute with sudo",
       default: false
+    method_option :connect_attribute,
+      aliases: "-a",
+      type: :string,
+      desc: "The attribute to use for opening the connection",
+      enum: ["ipv4", "hostname"],
+      default: "hostname"
     desc "exec ENV CMD", "execute an arbitrary shell command on all nodes in an environment."
     def exec(environment, command)
       env = find_environment!(environment)
@@ -158,7 +164,9 @@ module Berkflow
       end
 
       say "Executing command on #{nodes.length} nodes..."
-      success, failures, out = handle_results nodes.pmap { |node| ridley.node.run(node.public_hostname, command) }
+      success, failures, out = handle_results nodes.pmap { |node|
+        ridley.node.run connect_address(node, options), command
+      }
 
       unless success.empty?
         say "Successfully executed command on #{success.length} nodes"
@@ -172,6 +180,12 @@ module Berkflow
       failures.empty? ? exit(0) : exit(1)
     end
 
+    method_option :connect_attribute,
+      aliases: "-a",
+      type: :string,
+      desc: "The attribute to use for opening the connection",
+      enum: ["ipv4", "hostname"],
+      default: "hostname"
     desc "run_chef ENV", "run chef on all nodes in the given environment."
     def run_chef(environment)
       env = find_environment!(environment)
@@ -185,7 +199,9 @@ module Berkflow
       end
 
       say "Running Chef Client on #{nodes.length} nodes..."
-      success, failures, out = handle_results nodes.pmap { |node| ridley.node.chef_run(node.public_hostname) }
+      success, failures, out = handle_results nodes.pmap { |node|
+        ridley.node.chef_run connect_address(node, options)
+      }
 
       unless success.empty?
         say "Successfully ran Chef Client on #{success.length} nodes"
@@ -209,6 +225,12 @@ module Berkflow
       aliases: "-s",
       desc: "Skip running chef-client on nodes in specified environment",
       default: false
+    method_option :connect_attribute,
+      aliases: "-a",
+      type: :string,
+      desc: "The attribute to use for opening the connection",
+      enum: ["ipv4", "hostname"],
+      default: "hostname"
     desc "upgrade ENV APP [VERSION]", "upgrade an environment to the specified cookbook version."
     long_desc <<-EOH
       Upgrades an environment to the specified cookbook version. If no version is given then the latest
@@ -269,6 +291,17 @@ module Berkflow
         Berkshelf::Config.instance
       end
 
+      def connect_address(node, options)
+        address = case options[:connect_attribute].downcase
+        when "ipv4"
+          node.public_ipv4
+        when "hostname"
+          node.public_hostname
+        else
+          node.public_hostname
+        end
+      end
+
       def handle_results(result_set)
         failure,  success = result_set.partition { |result| result.error? }
         log_dir           = log_results(success, failure)

data/lib/berkflow/version.rb

@@ -1,3 +1,3 @@
 module Berkflow
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkflow
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse