factor 0.5.16 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df70093d41d893436a8b43a6d08f4ffe87249fb
-  data.tar.gz: 8b163aa8f9b1ebe4c9ddaf8c24f67d28917c2e10
+  metadata.gz: 5b3d20f8470d86ea79e6ad2646d2b7dac6695a9b
+  data.tar.gz: d8ef8ec97799a1f481581706c78e1631a0a4600c
 SHA512:
-  metadata.gz: 0e1d4fa2b2775bc2d34bc43acc8bed86f518d0b1865a56647679536454e1e0c52f0ee20db18d5cae137b256e4fafd8cf8f85b8c4c282eef88117482638c519cb
-  data.tar.gz: 29e9b70bf5ccf70e7cf1292c7ec4e8f11377c4a6efb1a96dc84c8b4939372a53151d486d73f9ee5464ee60b9a503f290b54ea56500101a240143f036d7ee6f87
+  metadata.gz: e540f40fd32b06cee12fcee1ae7e2a9a80d01cf878837b052eddb10e3af906b24460b697fb842a95e8244287ebe2a8bc6684ad0a0accbe992bbc504540de6956
+  data.tar.gz: 8234653325650c2a16ad5a2f92c7d99f8cc6230eb8e12efe2496e070bbbbb0af7246670805751ffd75d9597d1b04b4b7af7d236c4c94ee9a56e908c9641d2420

data/lib/commands/workflows.rb

@@ -23,7 +23,72 @@ module Factor
         load_config(config_settings)
         load_all_workflows(workflow_filename)
         block_until_interupt
-        log_message 'status' => 'info', 'message' => 'Good bye!'
+        info 'Good bye!'
+      end
+
+      def cloud(args, options)
+        account_id  = args[0]
+        workflow_id = args[1]
+        api_key     = args[2]
+
+        if !api_key || !workflow_id || !account_id
+          error "API Key, Worklfow ID and Acount ID are all required"
+          exit
+        end
+
+        info "Getting workflow (#{workflow_id}) from Factor.io Cloud"
+        begin
+          workflow_url = "https://factor.io/#{account_id}/workflows/#{workflow_id}.json?auth_token=#{api_key}"
+          raw_content = RestClient.get(workflow_url)
+          workflow_info = JSON.parse(raw_content)
+        rescue => ex
+          error "Couldn't retreive workflow: #{ex.message}"
+          exit
+        end
+
+        workflow_definition = workflow_info["workflow_definition"]
+
+        info "Getting credentials from Factor.io Cloud"
+        begin
+          credential_url = "https://factor.io/#{account_id}/credentials.json?auth_token=#{api_key}"
+          raw_content = RestClient.get(credential_url)
+          credential_info = JSON.parse(raw_content)
+        rescue => ex
+          error "Couldn't retreive workflow: #{ex.message}"
+          exit
+        end
+
+        credentials = {}
+        credential_info.each do |credential|
+          credentials[credential['service']] ||= {}
+          credentials[credential['service']][credential['name']] = credential['value']
+        end
+
+        configatron[:credentials].configure_from_hash(credentials)
+
+        info "Getting connector settings from Factor.io Index Server"
+        begin
+          connectors_url = options.index
+          connectors_url ||= 'https://raw.githubusercontent.com/factor-io/index/master/connectors.yml'
+          raw_content = RestClient.get(connectors_url)
+          connectors_info = YAML.parse(raw_content).to_ruby
+        rescue
+          error "Couldn't retreive connectors info"
+          exit
+        end
+
+        connectors = {}
+        connectors_info.each do |connector_id, connector_info|
+          connectors[connector_id] = connector_info['connectors']
+        end
+
+        configatron[:connectors].configure_from_hash(connectors)
+
+        @workflows[workflow_id] = load_workflow_from_definition(workflow_definition)
+
+        block_until_interupt
+
+        info 'Good bye!'
       end
 
       private
@@ -37,28 +102,26 @@ module Factor
         elsif file_list.count == 0
           error 'No workflows in this directory to run'
         else
-          file_list.each { |filename| load_workflow(filename) }
+          file_list.each { |filename| load_workflow(File.expand_path(filename)) }
         end
       end
 
       def block_until_interupt
-        log_message 'status' => 'info', 'message' => 'Ctrl-c to exit'
+        info 'Ctrl-c to exit'
         begin
           loop do
             sleep 1
           end
         rescue Interrupt
-          log_message 'status' => 'info', 'message' => 'Exiting app...'
+          info 'Exiting app...'
         ensure
-          @workflows.keys.each { |filename| unload_workflow(filename) }
+          @workflows.keys.each { |workflow_id| unload_workflow(workflow_id) }
         end
       end
 
       def load_workflow(filename)
-        workflow_filename = File.expand_path(filename)
-        log_message(
-          'status' => 'info',
-          'message' =>  "Loading workflow from #{workflow_filename}")
+        # workflow_filename = File.expand_path(filename)
+        info "Loading workflow from #{workflow_filename}"
         begin
           workflow_definition = File.read(workflow_filename)
         rescue => ex
@@ -66,9 +129,11 @@ module Factor
           return
         end
 
-        log_message(
-          'status' => 'info',
-          'message' =>  'Setting up workflow processor')
+        @workflows[workflow_filename] = load_workflow_from_definition(workflow_definition)
+      end
+
+      def load_workflow_from_definition(workflow_definition)
+        info "Setting up workflow processor"
         begin
           connector_settings = configatron.connectors.to_hash
           credential_settings = configatron.credentials.to_hash
@@ -79,24 +144,21 @@ module Factor
           exception message, ex
         end
 
-        @workflows[workflow_filename] = fork do
+        workflow_thread = fork do
           begin
-            log_message(
-              'status' => 'info',
-              'message' => "Starting #{workflow_filename}")
+            info "Starting workflow"
             runtime.load(workflow_definition)
           rescue => ex
-            exception "Couldn't load #{workflow_filename}", ex
+            exception "Couldn't workflow", ex
           end
         end
+
+        workflow_thread
       end
 
-      def unload_workflow(filename)
-        workflow_filename = File.expand_path(filename)
-        log_message(
-          'status' => 'info',
-          'message' =>  "Stopping #{workflow_filename}")
-        Process.kill('SIGINT', @workflows[workflow_filename])
+      def unload_workflow(workflow_id)
+        info "Stopping #{workflow_id}"
+        Process.kill('SIGINT', @workflows[workflow_id])
       end
 
       def log_message(message_info)

data/lib/factor.rb

@@ -20,6 +20,13 @@ command 'server' do |c|
   c.when_called Factor::Commands::Workflow, :server
 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'
+  c.option '--index URL', String, 'Use non-default Index server to get list of available credentials'
+  c.when_called Factor::Commands::Workflow, :cloud
+end
+
 command 'registry workflows' do |c|
   c.syntax = 'factor registry workflows'
   c.description = 'Get list of available workflow jumpstarts'

data/lib/factor/version.rb

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

data/spec/base_spec.rb

@@ -87,9 +87,6 @@ describe Factor::Commands::Command do
         @command.load_config config_settings
       end
 
-      expect(output).to include('Loading credentials')
-      expect(output).to include('Loading connectors')
-
       expect(configatron.credentials.github.api_key).to eq('fake_github_key')
       expect(configatron.credentials.heroku.api_key).to eq('fake_heroku_key')
       connectors_content.keys.each do |expected_connector_key|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.6.0
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander