factor 0.5.06 → 0.5.07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factor (0.5.04)
+    factor (0.5.06)
       colored (~> 1.2)
       commander (~> 4.2.0)
       configatron (~> 4.2.0)

data/lib/factor/version.rb

@@ -2,5 +2,5 @@
 
 # Primary Factor.io module
 module Factor
-  VERSION = '0.5.06'
+  VERSION = '0.5.07'
 end

data/lib/runtime.rb

@@ -30,8 +30,8 @@ module Factor
       end
 
       @connectors = {}
-      connectors.each do |connector_id, connector_url|
-        @connectors[connector_id] = Listener.new(connector_url)
+      flat_hash(connectors).each do |key, connector_url|
+        @connectors[key] = Listener.new(connector_url)
       end
 
       @credentials = {}
@@ -47,10 +47,14 @@ module Factor
     end
 
     def listen(service_ref, params = {}, &block)
-      service_id, listener_id = service_ref.split('::')
-      ws = @connectors[service_id.to_sym].listener(listener_id)
+      service_map = service_ref.split('::') 
+      service_id = service_map.first
+      listener_id = service_map.last
+      service_key = service_map[0..-2].map{|k| k.to_sym}
 
-      handle_on_open(service_id, listener_id, 'Listener', ws, params)
+      ws = @connectors[service_key].listener(listener_id)
+
+      handle_on_open(service_ref, 'Listener', ws, params)
 
       ws.on :close do
         error 'Listener disconnected'
@@ -68,9 +72,9 @@ module Factor
           success "Workflow '#{service_id}::#{listener_id}' triggered"
           error_handle_call(listener_response, &block)
         when 'return'
-          success "Workflow '#{service_id}::#{listener_id}' started"
+          success "Workflow '#{service_ref}' started"
         when 'fail'
-          error "Workflow '#{service_id}::#{listener_id}' failed to start"
+          error "Workflow '#{service_ref}' failed to start"
         when 'log'
           listener_response['message'] = "  #{listener_response['message']}"
           log_message(listener_response)
@@ -100,8 +104,12 @@ module Factor
     end
 
     def run(service_ref, params = {}, &block)
-      service_id, action_id = service_ref.split('::')
-      ws = @connectors[service_id.to_sym].action(action_id)
+      service_map = service_ref.split('::') 
+      service_id = service_map.first
+      action_id = service_map.last
+      service_key = service_map[0..-2].map{|k| k.to_sym}
+
+      ws = @connectors[service_key].action(action_id)
 
       handle_on_open(service_id, action_id, 'Action', ws, params)
 
@@ -114,12 +122,12 @@ module Factor
         case action_response['type']
         when 'return'
           ws.close
-          success "Action '#{service_id}::#{action_id}' responded"
+          success "Action '#{service_ref}' responded"
           error_handle_call(action_response, &block)
         when 'fail'
           ws.close
           error "  #{action_response['message']}"
-          error "Action '#{service_id}::#{action_id}' failed"
+          error "Action '#{service_ref}' failed"
         when 'log'
           action_response['message'] = "  #{action_response['message']}"
           log_message(action_response)
@@ -135,10 +143,19 @@ module Factor
 
     private
 
-    def handle_on_open(service_id, action_id, dsl_type, ws, params)
+    def flat_hash(h,f=[],g={})
+      return g.update({ f=>h }) unless h.is_a? Hash
+      h.each { |k,r| flat_hash(r,f+[k],g) }
+      g
+    end
+
+    def handle_on_open(service_ref, dsl_type, ws, params)
+      service_map = service_ref.split('::') 
+      service_id = service_map.first
+
       ws.on :open do
         params.merge!(@credentials[service_id.to_sym] || {})
-        success "#{dsl_type.capitalize} '#{service_id}::#{action_id}' called"
+        success "#{dsl_type.capitalize} '#{service_ref}' called"
         ws.send(params.to_json)
       end
     end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.5.06
+  version: 0.5.07
+  prerelease: 
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,26 +169,27 @@ files:
 - spec/workflow_spec.rb
 homepage: https://factor.io
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CLI to manager workflows on Factor.io
 test_files:
 - spec/base_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: bddfffa82901828336ac74f9e5d7e4a36b6e7f7a
-  data.tar.gz: c59c12d7fcc496dc86913fdb3700ffd643a6b833
-SHA512:
-  metadata.gz: 603c84c45c762bd51b582bef876c0a5a3e8284c0967f8af863a504fcbec93975eab9857375c5a536eaa53a1866d1f71344fd4ce104705bae36401d1398ebf551
-  data.tar.gz: 016fcc9526e20f0550a5bc92c1dce3c00bdfdc44da357647646db8ac9d5e356d7f5dbaffb50667500a0370086188c1cdcfb72c6adac819824ba1e1f41e8d3122