factor 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b3d20f8470d86ea79e6ad2646d2b7dac6695a9b
-  data.tar.gz: d8ef8ec97799a1f481581706c78e1631a0a4600c
+  metadata.gz: e9b26a00f37b7806ed314cb0c1b5facb3e62ae96
+  data.tar.gz: 842281a638e5b05a856d30d465ac06b15df906fb
 SHA512:
-  metadata.gz: e540f40fd32b06cee12fcee1ae7e2a9a80d01cf878837b052eddb10e3af906b24460b697fb842a95e8244287ebe2a8bc6684ad0a0accbe992bbc504540de6956
-  data.tar.gz: 8234653325650c2a16ad5a2f92c7d99f8cc6230eb8e12efe2496e070bbbbb0af7246670805751ffd75d9597d1b04b4b7af7d236c4c94ee9a56e908c9641d2420
+  metadata.gz: ad7b2c27f8afe87f0a5c90634a54cbf51d6a9c0b1a5c4caaaed08538fe702af54e077eaf1d83bac864274252620df0283528f551f6d2be1ec43bedcfadc64403
+  data.tar.gz: 9344a5f686527bc413bdbf0cc9e81333813a7a0a11a07dddf31098dd1e2ade0f63a39d39a6180be63dbd4c693fb674f328dd66f49bd21b080487a7667a1736ab

data/lib/commands/workflows.rb

@@ -30,6 +30,7 @@ module Factor
         account_id  = args[0]
         workflow_id = args[1]
         api_key     = args[2]
+        host        = (options.host || "https://factor.io").sub(/(\/)+$/,'')
 
         if !api_key || !workflow_id || !account_id
           error "API Key, Worklfow ID and Acount ID are all required"
@@ -38,7 +39,7 @@ module Factor
 
         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}"
+          workflow_url = "#{host}/#{account_id}/workflows/#{workflow_id}.json?auth_token=#{api_key}"
           raw_content = RestClient.get(workflow_url)
           workflow_info = JSON.parse(raw_content)
         rescue => ex
@@ -50,36 +51,29 @@ module Factor
 
         info "Getting credentials from Factor.io Cloud"
         begin
-          credential_url = "https://factor.io/#{account_id}/credentials.json?auth_token=#{api_key}"
+          credential_url = "#{host}/#{account_id}/credentials.json?auth_token=#{api_key}"
           raw_content = RestClient.get(credential_url)
-          credential_info = JSON.parse(raw_content)
+          credentials = 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"
+        info "Getting connectors from Factor.io Cloud"
+        connectors = {}
         begin
-          connectors_url = options.index
-          connectors_url ||= 'https://raw.githubusercontent.com/factor-io/index/master/connectors.yml'
+          connectors_url = "#{host}/#{account_id}/connectors.json?auth_token=#{api_key}"
           raw_content = RestClient.get(connectors_url)
-          connectors_info = YAML.parse(raw_content).to_ruby
-        rescue
-          error "Couldn't retreive connectors info"
-          exit
-        end
+          raw_connectors = JSON.parse(raw_content)
 
-        connectors = {}
-        connectors_info.each do |connector_id, connector_info|
-          connectors[connector_id] = connector_info['connectors']
+          raw_connectors.each do |connector_id,connector_info|
+            connectors[connector_id] = connector_info['connectors'].values.first
+          end
+        rescue => ex
+          error "Couldn't retreive workflow: #{ex.message}"
+          exit
         end
 
         configatron[:connectors].configure_from_hash(connectors)

data/lib/factor.rb

@@ -23,7 +23,7 @@ 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.option '--host URL', String, 'Use non-default Cloud service provider (e.g. pro server)'
   c.when_called Factor::Commands::Workflow, :cloud
 end
 

data/lib/factor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement