stacksondeck 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad2f38eed9b040ecd478a3b9f1e785c2c2ab6f7
-  data.tar.gz: 38a3d1ac048b988e0b42ed9d38ae9c1d25c03665
+  metadata.gz: 6cdff7f13a7e76edb2d9aaf98e8248d40188d6ca
+  data.tar.gz: 52fe4bf51c8ef01486a5a10da059ffc9fc48d50e
 SHA512:
-  metadata.gz: 6b7aec1b2d045d23d27247dedde1cbf741b12dcfce7b3af8d9d9f04cf9d585b57e033d7702ba5f93a9726657fcd94ab9334ad90d26254371fa2dec9aa2cc885e
-  data.tar.gz: 5bb25be330c392a14840e28c8f2cdf71b46634f5e72496811e98ffd54299e27977202e29ecb16b843dbbe403fe1ff2a4cd7e239e40c43a4906834d0fabf763d2
+  metadata.gz: 9a613b9ca2c7c4fe1d677cc1a7994761662dad56ca3cc18e5ea6994e4f3083fbc8b5092284bfc97efec9683a9435b6523d80917d7cebc03f9ac8bc2ed027733a
+  data.tar.gz: 63ccaf3fc121151c742e5e3e5f20cf95f34358c622074a6a9933c457e773f9187e16c5c85eaed0bd7a266c3ac176f86ccfdd8b97a23864dd003911de731747fa

data/Readme.md

@@ -8,8 +8,10 @@ Chef server using the provided knife credentials (`--config`); results are cache
 for a configurable amount of time (`--refresh`). You may also wish to override
 the Rundeck user name to suit your environment (`--username`).
 
-**N.B.** SOD merges a Chef node's environments, roles, and tags into Rundeck
-tags. This behavior is not currently configurable.
+SOD merges a Chef node's environments, roles, and tags into Rundeck tags. This
+behavior is not currently configurable, but you may use the `--tagfile` feature
+(introduced in v1.1.3) to map node names to a list of additional tags, which
+will be merged with the information discovered via Chef Search.
 
 
 ## Usage
@@ -39,7 +41,8 @@ You're most likely inteterested in the `server` command:
       -u, [--username=USERNAME]        # Username value for Rundeck node
                                        # Default: ${job.username}
       -r, [--refresh=N]                # Refresh interval in seconds
-                                       # Default: 60
+                                       # Default: 900
+      -t, [--tagfile=TAGFILE]          # JSON file with node tags
       -l, [--log=LOG]                  # Log to file instead of STDOUT
       -v, [--debug], [--no-debug]      # Enable DEBUG-level logging
       -z, [--trace], [--no-trace]      # Enable TRACE-level logging
@@ -82,8 +85,13 @@ Return the application version:
 (Yeah I lied when I said only one endpoint. Sue me.)
 
 
+
 ## Changelog
 
+#### v1.1.3
+
+- Added new `tagfile` feature
+
 #### v1.1.2
 
 - Allow override of `username` via query parameter

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/stacksondeck/app.rb

@@ -59,10 +59,17 @@ module StacksOnDeck
     def log ; settings.log end
 
 
+    def self.refresh_tagfile!
+      return {} if settings.tagfile.nil?
+      JSON.parse File.read(settings.tagfile)
+    end
+
     def self.refresh!
       log.info event: 'refresh!'
       started = Time.now
 
+      node_tags = refresh_tagfile!
+
       nodes = @@ridley.partial_search :node, 'name:*', %w[
         name
         hostname
@@ -89,7 +96,8 @@ module StacksOnDeck
         tags  = n.tags  || []
         tags += n.roles || []
         tags << n.chef_environment
-        tags.compact!
+        tags += node_tags[name] if node_tags.include? name
+        tags  = tags.uniq.compact
 
         next if n.hostname.nil?
 

data/lib/stacksondeck/main.rb

@@ -6,6 +6,8 @@ require_relative 'mjolnir'
 require_relative 'metadata'
 
 
+Thread.abort_on_exception = true
+
 module StacksOnDeck
 
   # StacksOnDeck's entrypoint.
@@ -23,6 +25,14 @@ module StacksOnDeck
       puts "\n%s\n" % ART
     end
 
+    SYSTEM_KNIFE = '/etc/chef/knife.rb'
+    USER_KNIFE   = File.join(ENV['HOME'] || '', '.chef', 'knife.rb')
+
+    DEFAULT_KNIFE = if File.exist? SYSTEM_KNIFE
+      SYSTEM_KNIFE
+    elsif File.exist? USER_KNIFE
+      USER_KNIFE
+    end
 
     desc 'server', 'Start application web server'
     option :bind, \
@@ -44,7 +54,8 @@ module StacksOnDeck
       type: :string,
       aliases: %w[ -c ],
       desc: 'Location of Chef configuration',
-      default: '/etc/chef/knife.rb'
+      default: DEFAULT_KNIFE,
+      required: true
     option :username, \
       type: :string,
       aliases: %w[ -u ],
@@ -55,6 +66,11 @@ module StacksOnDeck
       aliases: %w[ -r ],
       desc: 'Refresh interval in seconds',
       default: 900
+    option :tagfile, \
+      type: :string,
+      aliases: %w[ -t ],
+      desc: 'JSON file with node tags',
+      required: false
     include_common_options
     def server
       App.set :log, log
@@ -64,6 +80,7 @@ module StacksOnDeck
       App.set :refresh, options.refresh
       App.set :username, options.username
       App.set :environment, options.environment
+      App.set :tagfile, options.tagfile
 
       if options.debug?
         App.set :raise_errors, true
@@ -72,13 +89,7 @@ module StacksOnDeck
         App.set :logging, ::Logger::DEBUG
       end
 
-      Celluloid.logger = nil
-      Thread.abort_on_exception = false
-
-      if options.trace?
-        Celluloid.logger = log
-        Thread.abort_on_exception = true
-      end
+      Celluloid.logger = options.trace? ? log : nil
 
       log.info event: 'server', options: options
       App.run!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stacksondeck
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Stupid simple Chef-Rundeck integration