jerakia 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d60cfa4acc9acaa66de455ac86989fd4b13a7f1
-  data.tar.gz: 301df6f518a33f3a04b6149094a7e5a89ac9e174
+  metadata.gz: 6df8996d25559af0bcf6ad225192a388220ef943
+  data.tar.gz: 74b262c70e3524dea135723ff97d662f0cba4834
 SHA512:
-  metadata.gz: f23a7ff628bedf5d28e6d7388a36965a04d7772b8f105f1562d7735721df7588595abd79d25915a1e02c38f05f5d4afb7ad5fd42d88adc6047dc00e2cd39040b
-  data.tar.gz: 87c327d5e699a47e3b46936fa05ff0ea9e09977574158067bab102ebee9c369a5029476ba993eacbb0c1a8cf6c92298ebff5cc57771e19423808cacde0174a7a
+  metadata.gz: 580bf363db9ee210ad2f78a9b517d4e47ebbfdc24f5141d6d4cdae96eab10fcc8625a0f494c54cad693bb932dfd7b8773796d842af5fb4c71f6a3125a803a631
+  data.tar.gz: ed54de2458ad940e5cc581799d17d1b2391af6baa783670f51245f85c1049cecf78dd9446accf1625094f1e778c8f638736e19217255146f0fb7f1bb6286d926

data/lib/jerakia/cli/server.rb

@@ -4,6 +4,21 @@ class Jerakia
       def self.included(thor)
         thor.class_eval do
           desc 'server <options>', 'Start the Jerakia REST server'
+          option :port,
+                 aliases: :p,
+                 type: :string,
+                 desc: 'Specify alternate port to bind to (default 9843)'
+
+          option :bind,
+                 aliases: :b,
+                 type: :string,
+                 desc: 'Specify alternate address to bind to (default 127.0.0.1)'
+
+          option :token_ttl,
+                 aliases: :t,
+                 type: :string,
+                 desc: 'Specify token TTL (default 300)'
+
           option :config,
                  aliases: :c,
                  type: :string,
@@ -37,11 +52,17 @@ class Jerakia
               :config => options[:config],
               :logfile  => logfile,
               :loglevel => loglevel,
-              :trace    => options[:trace]
+              :trace    => options[:trace],
             }
 
+            server_opts = {
+              "port" => options[:port],
+              "bind" => options[:bind],
+              "token_ttl" => options[:token_ttl],
+            }.reject { |k,v| v.nil? }
+
             require 'jerakia/server'
-            Jerakia::Server.start(jerakia_opts)
+            Jerakia::Server.start(jerakia_opts, server_opts)
           end
         end
       end

data/lib/jerakia/server.rb

@@ -27,13 +27,14 @@ class Jerakia
         @jerakia
       end
 
-      def start(opts)
+      def start(opts, server_opts={})
         @jerakia = Jerakia.new(opts)
         require 'jerakia/server/rest'
-        @config = default_config.merge(Jerakia.config[:server] || {})
+        @config = default_config.merge(Jerakia.config[:server] || {}).merge(server_opts)
         Thin::Logging.logger=Jerakia.log.logger
         Jerakia::Server::Rest.set :bind, @config['bind']
         Jerakia::Server::Rest.set :port, @config['port']
+        Jerakia.log.verbose("Starting Jerakia on #{@config['bind']}:#{@config['port']}")
         Jerakia::Server::Rest.run!
       end
     end

data/lib/jerakia/version.rb

@@ -3,5 +3,5 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -167,7 +167,7 @@ files:
 - lib/jerakia/version.rb
 homepage: http://jerakia.io
 licenses:
-- Apache-2.0
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []