factor 0.0.95 → 0.0.96
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/cli/server_task.rb +4 -1
- data/lib/runtime/engine.rb +26 -6
- metadata +1 -17
data/lib/cli/server_task.rb
CHANGED
@@ -47,7 +47,10 @@ module Factor
|
|
47
47
|
say "starting the server...", :green
|
48
48
|
message = engine.start
|
49
49
|
if message.is_a?(Exception)
|
50
|
-
say "
|
50
|
+
say "[Unknown exception]", :red
|
51
|
+
say " message:#{message}", :red
|
52
|
+
say " backtrace:", :red
|
53
|
+
message.backtrace.each {|line| say " #{line}", :red}
|
51
54
|
else
|
52
55
|
say "disconnecting...", :green
|
53
56
|
end
|
data/lib/runtime/engine.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
require 'rubygems'
|
2
2
|
require 'factor'
|
3
3
|
require 'mustache'
|
4
|
-
require 'facter'
|
4
|
+
#require 'facter'
|
5
5
|
|
6
6
|
|
7
7
|
module Factor
|
@@ -84,10 +84,12 @@ module Factor
|
|
84
84
|
|
85
85
|
values = message.body.merge(@credentials)
|
86
86
|
# this maps the input values passed in with the templated defined in the workflow
|
87
|
-
|
88
|
-
activity["params"]
|
89
|
-
|
90
|
-
|
87
|
+
|
88
|
+
puts "[activity-params] #{activity["params"]}"
|
89
|
+
puts "[values] #{values}"
|
90
|
+
params = render_template(activity["params"],values)
|
91
|
+
puts "[params] #{params}"
|
92
|
+
|
91
93
|
event = call_channel_method(channel,method,params)
|
92
94
|
|
93
95
|
response_message = message.respond(event.params,event.class.name.split("::").last)
|
@@ -117,10 +119,28 @@ module Factor
|
|
117
119
|
|
118
120
|
private
|
119
121
|
|
122
|
+
def render_template(source,values)
|
123
|
+
#params = Hash.new
|
124
|
+
|
125
|
+
if source.is_a?(Hash)
|
126
|
+
params = Hash.new
|
127
|
+
source.each do |key,template|
|
128
|
+
params[key]=render_template(template,values)
|
129
|
+
end
|
130
|
+
else
|
131
|
+
params = Mustache.render(source,values)
|
132
|
+
end
|
133
|
+
|
134
|
+
# activity_params.each do |key,template|
|
135
|
+
# params[key]=Mustache.render(template,values)
|
136
|
+
# end
|
137
|
+
params
|
138
|
+
end
|
139
|
+
|
120
140
|
def match(target)
|
121
141
|
return true if target==nil || target==""
|
122
142
|
facts={}
|
123
|
-
Facter.each {|k,v| facts[k]=v}
|
143
|
+
#Facter.each {|k,v| facts[k]=v}
|
124
144
|
@tags.each {|k,v| facts[k]=v}
|
125
145
|
key,value=target.split("=")
|
126
146
|
facts[key]==value
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: factor
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.96
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -123,22 +123,6 @@ dependencies:
|
|
123
123
|
- - ! '>='
|
124
124
|
- !ruby/object:Gem::Version
|
125
125
|
version: 0.9.8
|
126
|
-
- !ruby/object:Gem::Dependency
|
127
|
-
name: facter
|
128
|
-
requirement: !ruby/object:Gem::Requirement
|
129
|
-
none: false
|
130
|
-
requirements:
|
131
|
-
- - '='
|
132
|
-
- !ruby/object:Gem::Version
|
133
|
-
version: 1.6.16
|
134
|
-
type: :runtime
|
135
|
-
prerelease: false
|
136
|
-
version_requirements: !ruby/object:Gem::Requirement
|
137
|
-
none: false
|
138
|
-
requirements:
|
139
|
-
- - '='
|
140
|
-
- !ruby/object:Gem::Version
|
141
|
-
version: 1.6.16
|
142
126
|
description: Friendly command-line interface and library for Factor
|
143
127
|
email: maciej@skierkowski.com
|
144
128
|
executables:
|