factor 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de59489e42da320e68f586ec424afe9ca68ca25a
-  data.tar.gz: 314cc835b4304aa42a40d3827e4abe24f648a50d
+  metadata.gz: af39fc9efe3999659f027cfc4cdf50a2c40c4533
+  data.tar.gz: deebd96954ace642c46f23f9fdb6b038c6ad4d99
 SHA512:
-  metadata.gz: 9e240a8437547554f5aeb5036315057e23a5dffb2477c0ad6bd12a3dfd4511f961763d14daaa2cdcf0c98b29b9015868b3b3e594d1264fc322587ec55cbb5f5d
-  data.tar.gz: 9c56560e8cf41062d0629042d01e4bbcbea5102dd452cca4df67a3fb4883ccddbab2170ec98f122224465b1b05130f3e476756f1b13249a6b5c359e49a2f03b3
+  metadata.gz: f85d0d40425675967ca5b8b01709a36ae06803560be6fe10e633a26e6bdb897a7ffebbb0c905062332dcb642e3dc0e0d8075949fc2e1c77bd8286ccd40192899
+  data.tar.gz: a7dcd984dba299c0812f69e0b7da04aebf5d9bfa1cf16039384e6f5bd2ba35be0bc339837589f4b3569114204122a9db1875ee667504e84fa9980af89c8fdcbf

data/lib/commands.rb

@@ -5,6 +5,7 @@ require 'commander/import'
 require 'factor/version'
 require 'commands/workflow_command'
 require 'commands/registry_command'
+require 'commands/run_command'
 
 program :name, 'Factor.io Server'
 program :version, Factor::VERSION
@@ -20,6 +21,14 @@ command 'server' do |c|
   c.when_called Factor::Commands::WorkflowCommand, :server
 end
 
+command 'run' do |c|
+  c.syntax = 'factor run service_address params'
+  c.description = 'Run a specific command.'
+  c.option '--credentials FILE', String, 'credentials.yml file path.'
+  c.option '--connectors FILE', String, 'connectors.yml file path'
+  c.when_called Factor::Commands::RunCommand, :run
+end
+
 command 'cloud' do |c|
   c.syntax = 'factor host <account id> <workflow id> <api key>'
   c.description = 'Start the Factor.io Server using your workflows and credentials from Factor.io Cloud'
@@ -35,9 +44,10 @@ end
 
 command 'registry workflows add' do |c|
   c.syntax = 'factor registry workflow add <id>'
-  c.description = 'Get list of available workflows'
+  c.description = 'Add a workflow to your working directory'
   c.option '--credentials FILE', String, 'credentials.yml file path.'
   c.option '--connectors FILE', String, 'connectors.yml file path'
+  c.option '--path FILE', String, 'Path to workflows'
   c.option '--values \'{"api_key":"foo"}\'', String, "{}"
   c.when_called Factor::Commands::RegistryCommand, :add_workflow
 end
@@ -48,7 +58,7 @@ command 'registry connectors' do |c|
   c.when_called Factor::Commands::RegistryCommand, :connectors
 end
 
-command 'registry connector add' do |c|
+command 'registry connectors add' do |c|
   c.syntax = 'factor registry connector add <id>'
   c.description = 'Get list of available connectors'
   c.option '--credentials FILE', String, 'credentials.yml file path.'

data/lib/commands/run_command.rb

@@ -0,0 +1,69 @@
+# encoding: UTF-8
+
+require 'configatron'
+
+require 'commands/base'
+require 'runtime/workflow'
+
+require 'pp'
+
+module Factor
+  module Commands
+    class RunCommand < Factor::Commands::Command
+      def initialize
+        @workflows = {}
+        super
+      end
+
+      def run(args, options)
+        config_settings = {}
+        config_settings[:credentials] = options.credentials
+        config_settings[:connectors]  = options.connectors
+        load_config(config_settings)
+
+        connector_settings = configatron.connectors.to_hash
+        credential_settings = configatron.credentials.to_hash
+        runtime = Factor::Runtime::Workflow.new(connector_settings, credential_settings, logger: logger)
+
+        begin
+          params = JSON.parse(args[1] || '{}')
+        rescue => ex
+          logger.error "'#{args[1]}' can't be parsed as JSON"
+        end
+
+        if params
+          EM.run do
+            runtime.run(args[0],params) do |response_info|
+              data = response_info.is_a?(Array) ? response_info.map {|i| i.marshal_dump} : response_info.marshal_dump
+              JSON.pretty_generate(data).split("\n").each do |line|
+                logger.info line
+              end
+              EM.stop
+            end.on_fail do
+              EM.stop
+            end
+          end
+
+          logger.info 'Good bye!'
+        end
+      end
+
+
+
+      private
+
+      def block_until_interupt
+        logger.info 'Ctrl-c to exit'
+        begin
+          loop do
+            sleep 1
+          end
+        rescue Interrupt
+          logger.info 'Exiting app...'
+        end
+      end
+
+
+    end
+  end
+end

data/lib/factor/version.rb

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

data/lib/runtime/service_caller.rb

@@ -84,7 +84,7 @@ module Factor
             message = "  #{action_response['message']}"
             notify :log, status: action_response['status'], message: message
           when 'start_workflow'
-            notify :start_workflow, action_response
+            notify :start_workflow, action_response['payload']
           else
             notify :log, status:'error', message: "Unknown action response: #{action_response}"
           end

data/lib/runtime/workflow.rb

@@ -73,7 +73,7 @@ module Factor
 
           caller.on :start_workflow do |data|
             success "Listener '#{address}' triggered"
-            block.call(Factor::Common.simple_object_convert(data['payload']))
+            block.call(Factor::Common.simple_object_convert(data)) if block
           end
 
           caller.on :fail do |info|
@@ -85,7 +85,8 @@ module Factor
             @logger.log log_info[:status], log_info
           end
 
-          caller.listen(address.id,params)
+          service_credentials = @credentials[address.service.to_sym] || {}
+          caller.listen(address.id,params.merge(service_credentials))
         end
         e
       end
@@ -128,24 +129,24 @@ module Factor
           caller.on :return do |data|
             success "Action '#{address}' responded"
             caller.close
-            block.call(Factor::Common.simple_object_convert(data['payload']))
+            block.call(Factor::Common.simple_object_convert(data)) if block
           end
 
           caller.on :close do
             error "Action '#{address}' disconnected"
-            e.fail_block.call(action_response) if e.fail_block
           end
 
           caller.on :fail do |info|
             error "Action '#{address}' failed"
-            e.fail_block.call(action_response) if e.fail_block
+            e.fail_block.call(info) if e.fail_block
           end
 
           caller.on :log do |log_info|
             @logger.log log_info[:status], log_info
           end
 
-          caller.action(address.id,params)
+          service_credentials = @credentials[address.service.to_sym] || {}
+          caller.action(address.id,params.merge(service_credentials))
         end
         e
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -149,6 +149,7 @@ files:
 - lib/commands.rb
 - lib/commands/base.rb
 - lib/commands/registry_command.rb
+- lib/commands/run_command.rb
 - lib/commands/workflow_command.rb
 - lib/common/deep_struct.rb
 - lib/factor/version.rb