jerakia 2.2.0 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/jerakia/cli/server.rb +23 -2
- data/lib/jerakia/server.rb +3 -2
- data/lib/jerakia/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6df8996d25559af0bcf6ad225192a388220ef943
|
4
|
+
data.tar.gz: 74b262c70e3524dea135723ff97d662f0cba4834
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 580bf363db9ee210ad2f78a9b517d4e47ebbfdc24f5141d6d4cdae96eab10fcc8625a0f494c54cad693bb932dfd7b8773796d842af5fb4c71f6a3125a803a631
|
7
|
+
data.tar.gz: ed54de2458ad940e5cc581799d17d1b2391af6baa783670f51245f85c1049cecf78dd9446accf1625094f1e778c8f638736e19217255146f0fb7f1bb6286d926
|
data/lib/jerakia/cli/server.rb
CHANGED
@@ -4,6 +4,21 @@ class Jerakia
|
|
4
4
|
def self.included(thor)
|
5
5
|
thor.class_eval do
|
6
6
|
desc 'server <options>', 'Start the Jerakia REST server'
|
7
|
+
option :port,
|
8
|
+
aliases: :p,
|
9
|
+
type: :string,
|
10
|
+
desc: 'Specify alternate port to bind to (default 9843)'
|
11
|
+
|
12
|
+
option :bind,
|
13
|
+
aliases: :b,
|
14
|
+
type: :string,
|
15
|
+
desc: 'Specify alternate address to bind to (default 127.0.0.1)'
|
16
|
+
|
17
|
+
option :token_ttl,
|
18
|
+
aliases: :t,
|
19
|
+
type: :string,
|
20
|
+
desc: 'Specify token TTL (default 300)'
|
21
|
+
|
7
22
|
option :config,
|
8
23
|
aliases: :c,
|
9
24
|
type: :string,
|
@@ -37,11 +52,17 @@ class Jerakia
|
|
37
52
|
:config => options[:config],
|
38
53
|
:logfile => logfile,
|
39
54
|
:loglevel => loglevel,
|
40
|
-
:trace => options[:trace]
|
55
|
+
:trace => options[:trace],
|
41
56
|
}
|
42
57
|
|
58
|
+
server_opts = {
|
59
|
+
"port" => options[:port],
|
60
|
+
"bind" => options[:bind],
|
61
|
+
"token_ttl" => options[:token_ttl],
|
62
|
+
}.reject { |k,v| v.nil? }
|
63
|
+
|
43
64
|
require 'jerakia/server'
|
44
|
-
Jerakia::Server.start(jerakia_opts)
|
65
|
+
Jerakia::Server.start(jerakia_opts, server_opts)
|
45
66
|
end
|
46
67
|
end
|
47
68
|
end
|
data/lib/jerakia/server.rb
CHANGED
@@ -27,13 +27,14 @@ class Jerakia
|
|
27
27
|
@jerakia
|
28
28
|
end
|
29
29
|
|
30
|
-
def start(opts)
|
30
|
+
def start(opts, server_opts={})
|
31
31
|
@jerakia = Jerakia.new(opts)
|
32
32
|
require 'jerakia/server/rest'
|
33
|
-
@config = default_config.merge(Jerakia.config[:server] || {})
|
33
|
+
@config = default_config.merge(Jerakia.config[:server] || {}).merge(server_opts)
|
34
34
|
Thin::Logging.logger=Jerakia.log.logger
|
35
35
|
Jerakia::Server::Rest.set :bind, @config['bind']
|
36
36
|
Jerakia::Server::Rest.set :port, @config['port']
|
37
|
+
Jerakia.log.verbose("Starting Jerakia on #{@config['bind']}:#{@config['port']}")
|
37
38
|
Jerakia::Server::Rest.run!
|
38
39
|
end
|
39
40
|
end
|
data/lib/jerakia/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jerakia
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Craig Dunn
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-07-
|
11
|
+
date: 2017-07-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
@@ -167,7 +167,7 @@ files:
|
|
167
167
|
- lib/jerakia/version.rb
|
168
168
|
homepage: http://jerakia.io
|
169
169
|
licenses:
|
170
|
-
- Apache
|
170
|
+
- Apache 2.0
|
171
171
|
metadata: {}
|
172
172
|
post_install_message:
|
173
173
|
rdoc_options: []
|