stacksondeck 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52d638d4e7a905255a9ab7cba68a1e1cfb162a2
-  data.tar.gz: 209b9b6c7c730478762f35a434f661dc03e90034
+  metadata.gz: 15986bb862a807230480fa8c0ce5fcc356739f17
+  data.tar.gz: d8489c25579af8b858444691e038dd7de9506241
 SHA512:
-  metadata.gz: 0cd2dd2d4a3e1f20df7da5138bb2522388733e9502c4f38bad01c49a649d6992e5b4b17ace08e1b1be907906c091c5296894dd46bf079e5528a77097d76261c8
-  data.tar.gz: 4c52a05ea6121b3d00c9c1a98f1fc5a5ca224bf61057b6b02d7dd1018684964389396400b9a2c614f2e254abd90e68fbd8ac89d7aedcdd57dccf2b9af230b1be
+  metadata.gz: e56c4f63a984b02ecc2a51756762a7f7eeedc3e96b5a27eb25ede66aaa054f203941023507cf6ceff4889f7a95659ae2f3f0d8ddf05603850f59e4d21934a3fb
+  data.tar.gz: 3176dd765e2447b7c113013920c6111a3490ce87d71053d737030945a78d3729b7d530b5047b2ec6c114903b848b72a2c4fbc3f253e9bf47406bd0235b052b5b

data/Readme.md

@@ -9,9 +9,8 @@ for a configurable amount of time (`--refresh`). You may also wish to override
 the Rundeck user name to suit your environment (`--username`).
 
 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.
+behavior is not currently configurable, but you may use the `--hints` feature
+(introduced in v1.2.0) to override information discovered via Chef Search.
 
 
 ## Usage
@@ -42,7 +41,7 @@ You're most likely inteterested in the `server` command:
                                        # Default: ${job.username}
       -r, [--refresh=N]                # Refresh interval in seconds
                                        # Default: 900
-      -t, [--tagfile=TAGFILE]          # JSON file with node tags
+      -h, [--hints=HINTS]              # JSON file with node hints
       -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
@@ -80,7 +79,7 @@ command line.
 
 Return the application version:
 
-    1.0.0
+    1.2.0
 
 (Yeah I lied when I said only one endpoint. Sue me.)
 
@@ -88,6 +87,14 @@ Return the application version:
 
 ## Changelog
 
+#### v1.2.0
+
+- Replace `tagfile` with more general `hints`
+
+#### v1.1.4
+
+- When no groups defined, report empty mapping rather than nothing
+
 #### v1.1.3
 
 - Added new `tagfile` feature

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.2.0

data/lib/stacksondeck/app.rb

@@ -5,6 +5,7 @@ require 'yaml'
 
 require 'ridley'
 require 'sinatra/base'
+require 'deep_merge'
 
 require_relative 'metadata'
 
@@ -59,16 +60,17 @@ module StacksOnDeck
     def log ; settings.log end
 
 
-    def self.refresh_tagfile!
-      return {} if settings.tagfile.nil?
-      JSON.parse File.read(settings.tagfile)
+    def self.refresh_hints!
+      return {} if settings.hints.nil?
+      return {} unless File.exist? settings.hints
+      JSON.parse File.read(settings.hints)
     end
 
     def self.refresh!
       log.info event: 'refresh!'
       started = Time.now
 
-      node_tags = refresh_tagfile!
+      hints = refresh_hints!
 
       nodes = @@ridley.partial_search :node, 'name:*', %w[
         name
@@ -88,19 +90,18 @@ module StacksOnDeck
       nodes.each do |n|
         name = n.name
         n = n.automatic
+        next if n.hostname.nil?
 
-        username  = settings.username
-        remoteUrl = File.join @@ridley.server_url, 'nodes', name
-        editUrl   = File.join remoteUrl, 'edit'
+        node_hints = hints[name] || {}
+        username   = settings.username
+        remote_url = File.join @@ridley.server_url, 'nodes', name
+        edit_url   = File.join remote_url, 'edit'
 
         tags  = n.tags  || []
         tags += n.roles || []
         tags << n.chef_environment
-        tags += node_tags[name] if node_tags.include? name
         tags  = tags.uniq.compact
 
-        next if n.hostname.nil?
-
         @@db[name] = {
           'hostname' => n.hostname,
           'description' => n.fqdn,
@@ -109,10 +110,10 @@ module StacksOnDeck
           'osFamily' => n.platform_family,
           'osName' => n.platform,
           'username' => username,
-          'remoteUrl' => remoteUrl,
-          'editUrl' => editUrl,
-          'tags' => tags.join(',')
-        }
+          'remoteUrl' => remote_url,
+          'editUrl' => edit_url,
+          'tags' => tags
+        }.deep_merge!(node_hints)
       end
 
       @@db_dump = YAML.dump @@db

data/lib/stacksondeck/main.rb

@@ -55,7 +55,7 @@ module StacksOnDeck
       aliases: %w[ -c ],
       desc: 'Location of Chef configuration',
       default: DEFAULT_KNIFE,
-      required: true
+      required: DEFAULT_KNIFE.nil?
     option :username, \
       type: :string,
       aliases: %w[ -u ],
@@ -66,10 +66,10 @@ module StacksOnDeck
       aliases: %w[ -r ],
       desc: 'Refresh interval in seconds',
       default: 900
-    option :tagfile, \
+    option :hints, \
       type: :string,
-      aliases: %w[ -t ],
-      desc: 'JSON file with node tags',
+      aliases: %w[ -h ],
+      desc: 'JSON file with node hints',
       required: false
     include_common_options
     def server
@@ -80,7 +80,7 @@ module StacksOnDeck
       App.set :refresh, options.refresh
       App.set :username, options.username
       App.set :environment, options.environment
-      App.set :tagfile, options.tagfile
+      App.set :hints, options.hints
 
       if options.debug?
         App.set :raise_errors, true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stacksondeck
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement