stacksondeck 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e49efd37e296506a098ac1585b9219d8a4a4361
-  data.tar.gz: 35f20659d5207f3d555a650e9095596935675d10
+  metadata.gz: 935257ae88643f86d0fed066e61ad135f3077774
+  data.tar.gz: fc8e391ff90a0f0f546c4e0a8bb84a494aab3ac4
 SHA512:
-  metadata.gz: dc02b1aaa95bccbdfd09f9beef5573d98ece3c4f508890728a9272feaada8affb6b729064bd964e4e1373dcd9198dad05dc9aa86f3555d6d993f86baae275114
-  data.tar.gz: 0d1fb4ed1bcc2c055e30da75a04961f5120561451a7f063bb0df68bcb52964b1cb9a9a01ad54ea5a44d8697b36489627b29475260a8700bab2ad8fc39427288d
+  metadata.gz: 3d8b2735dc60798e0a8c8e7928d36153059dd62436dc3ec6038b11161a541dbfdd90a257108247c05829d6fcad1d3c3de0ec241eb32f8418244e74917a2615d3
+  data.tar.gz: c9ab5285ab411e192b12e15ba2981a431290d0749696cc49ca22120049f9371961f389980eb26b8c74db737fb37c170ad2221564e5bb864818c9fb987ad3b242

data/Readme.md

@@ -42,6 +42,8 @@ You're most likely inteterested in the `server` command:
       -r, [--refresh=N]                # Refresh interval in seconds
                                        # Default: 900
       -h, [--hints=HINTS]              # JSON file with node hints
+      -q, [--query=QUERY]              # Query to find nodes
+                                       # Default: name:*
       -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
@@ -113,4 +115,4 @@ Return the application version:
 
 #### v1.0.0
 
-- Stupid simple Chef-Rundeck integration
+- Stupid simple Chef-Rundeck integration

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.3.0

data/lib/stacksondeck/app.rb

@@ -77,7 +77,7 @@ module StacksOnDeck
 
       hints = refresh_hints!
 
-      nodes = @@ridley.partial_search :node, 'name:*', %w[
+      nodes = @@ridley.partial_search :node, settings.query, %w[
         name
         hostname
         fqdn
@@ -143,4 +143,4 @@ module StacksOnDeck
 
 
   end
-end
+end

data/lib/stacksondeck/main.rb

@@ -71,6 +71,12 @@ module StacksOnDeck
       aliases: %w[ -h ],
       desc: 'JSON file with node hints',
       required: false
+    option :query, \
+      type: :string,
+      aliases: %w[ -q ],
+      desc: 'Query to find nodes',
+      default: 'name:*',
+      required: false
     include_common_options
     def server
       App.set :log, log
@@ -81,6 +87,7 @@ module StacksOnDeck
       App.set :username, options.username
       App.set :environment, options.environment
       App.set :hints, options.hints
+      App.set :query, options.query
 
       if options.debug?
         App.set :raise_errors, true
@@ -89,11 +96,12 @@ module StacksOnDeck
         App.set :logging, ::Logger::DEBUG
       end
 
-      Celluloid.logger = options.trace? ? log : nil
+      Celluloid.logger = options.debug? ? log : nil
+      Ridley::Logging.set_logger log if options.debug?
 
       log.info event: 'server', options: options
       App.run!
     end
 
   end
-end
+end

data/lib/stacksondeck/mjolnir.rb

@@ -20,12 +20,6 @@ module StacksOnDeck
         aliases: %w[ -v ],
         desc: 'Enable DEBUG-level logging',
         default: ENV['SOD_DEBUG'] || false
-      },
-      trace: {
-        type: :boolean,
-        aliases: %w[ -z ],
-        desc: 'Enable TRACE-level logging',
-        default: ENV['SOD_TRACE'] || false
       }
     }
 
@@ -39,30 +33,11 @@ module StacksOnDeck
 
     no_commands do
 
-      # Return a connection to the given OpenStack service
-      def os service
-        @os ||= {}
-        return @os[service] if @os.has_key? service
-        @os[service] = OpenStack::Connection.create \
-          auth_url: options.auth_url,
-          auth_method: options.auth_method,
-          authtenant_id: options.auth_tenant,
-          username: options.auth_user,
-          api_key: options.auth_pass,
-          service_type: service
-        log.trace \
-          event: 'OpenStack connection',
-          service: service
-        return @os[service]
-      end
-
-
       # Construct a Logger given the command-line options
       def log
         return @logger if defined? @logger
         level = :info
         level = :debug if options.debug?
-        level = :trace if options.trace?
         device = options.log || $stderr
         pretty = device.tty? rescue false
         @logger = Slog.new \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stacksondeck
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement