chorizo 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 659579aebc0837953ce9b0e6aa52e9fb96ee1282
-  data.tar.gz: 3a0568097cd7c635e2bdeb96ecf9b68b50b9a680
+SHA256:
+  metadata.gz: 8122032f6217f64bddafebe677c267649a4189bb351a712ffb02ef7f7ea09a0b
+  data.tar.gz: a28d67954f10dc25566e59f5bf4bf39066d91ccce03aa147937a36cdb83c4dc8
 SHA512:
-  metadata.gz: 014b12931f453768643f4effeb2e3439dfcab9bc2dd4319807077b14c2c3474d7d6eb4754db57a0b99671d542c30352c0434d2d989f831d1eda5ea9a05892a6b
-  data.tar.gz: e495bc0475636ea85df5c681bb35e077e2ebb5f17b5c099c1885d7aab4c653e68f859f2a090151455835121e0fc3dcd934e154c79d38852466aecccbef67cd93
+  metadata.gz: a236652bf178508833473bb442d867cbcc1b71c5ef0278ea97d803ff085575889f8d4e772860a40c1806835351ca9ac3b99370bfb9e229246d525cc60e941d99
+  data.tar.gz: 0d4c56cc2348cfede81a7620574172dca751555ccdee2824b7e161975d218568d170a020690ac63603b3dd9791b6a0fde86cd27ff696449d16044385ef6f776f

data/bin/chorizo

@@ -24,13 +24,6 @@ if opts[:target] == 'heroku' && !opts[:app]
   exit 1
 end
 
-case opts[:target]
-when 'cloud66'
-  Chorizo.new.cloud66 opts[:environment]
-when 'heroku'
-  Chorizo.new.heroku(opts[:environment], opts[:app])
-else
-  STDERR.puts "please specify a valid target".red
-  puts opts
-  exit 1
-end
+Chorizo.new.run(
+  opts[:environment], opts, target: opts[:target], app: opts[:app]
+)

data/lib/chorizo.rb

@@ -5,6 +5,9 @@ class Chorizo
 
   def initialize
     @host_names = %w(cloud66 heroku)
+
+    config_file = './config/chorizo.yml'
+    @config = YAML.load_file(config_file) if File.exist?(config_file)
   end
 
   def load_config
@@ -16,7 +19,7 @@ class Chorizo
     @host_names.each do |host|
       hosts[host] = hashes.delete(host) if hashes[host]
     end
-    { base: base, hosts: hosts, envs: hashes } 
+    { base: base, hosts: hosts, envs: hashes }
   end
 
   def build_output(env, host)
@@ -47,6 +50,40 @@ class Chorizo
     output
   end
 
+  def run(env, opts, target: nil, app: nil)
+    if @config
+      if target && target != @config[env]['target']
+        STDERR.puts 'WARNING: target differs from configuration'.red
+      end
+      target ||= @config[env]['target']
+
+      if app && app != @config[env]['app']
+        STDERR.puts 'WARNING: app differs from configuration'.red
+      end
+      app ||= @config[env]['app']
+    end
+
+    unless target && @host_names.include?(target)
+      error = "please specify a valid target [#{@host_names.join(', ')}]"
+      STDERR.puts(error.red)
+      puts opts
+      exit 1
+    end
+
+    case target
+    when 'cloud66'
+      cloud66(env)
+    when 'heroku'
+      unless app
+        STDERR.puts 'please specify an app for heroku'.red
+        puts opts
+        exit 1
+      end
+
+      heroku(env, app)
+    end
+  end
+
   def cloud66(env)
     output = build_output(env, 'cloud66')
     output.each do |k,v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chorizo
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Daniel Arnold
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Parse and set environment variables on hosting providers