fanforce-cli 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd322f56edd83f205daebadc27a6f6c95823258
-  data.tar.gz: 66d95972b4e054b04b716e31d2f12b797e46ea6d
+  metadata.gz: 7755e4c53dc744b5379f207ae89a153d4abb5ffe
+  data.tar.gz: 7774a0e270164adb3eb792a9c7cddc2e01ee6f10
 SHA512:
-  metadata.gz: b40bf4088fcbbf88097aea2af2ffadce7923d4663db3b6884a9b5a08fccf24880e8c478fd9fc08a79f97671f8a41f66c1234a37a7b34b5f91d189f7a5d170d2f
-  data.tar.gz: d441466e9e6fcf3200f9ecaa8f4cea9779c51482e453250aea469138b498e3e2494343d84b67f6841263a16ba839941562d95e1673c516cb855f05f4e8960ef8
+  metadata.gz: c482e88c8ea7c19da2cde0aa84479dae70d057400714b2a35caaa7e2305569e19841ddc0c528984cf3f9a63ffa7c58719b6f5cf9c57addf65233f52e0d941636
+  data.tar.gz: e622283205243815b7561083be35d92b0442ea8ab0a7ec2d052c410152c7d340fc075db956af513e0fcf150613a2e007581a2be83c2b65f95ff6620a806f91c7

data/lib/fanforce/cli/_base.rb

@@ -63,23 +63,14 @@ class Fanforce::CLI
     #################################################################
 
     elsif ARGV[0] == 'update'
-      if (!ARGV[1] or ARGV[1] == 'all') and !ARGV[2]
-        app_id = 'all' if !$Filter
-      elsif ARGV[1] =~ /^(all|app-([a-z0-9-]+))$/
-        app_id = ($1 == 'all') ? $1 : $2
-        raw_command = ARGV[2]
-      elsif ARGV[1]
-        raw_command = ARGV[1]
-      else
-        error('You supplied an invalid update command.', :update)
+      if !$Filter
+        ARGV[1] =~ /^(all|app-([a-z0-9-]+))$/i || error('You supplied an invalid update command.', :update)
+        app_id = $1
+        ARGV.delete_at(1)
       end
 
-      if raw_command
-        error('You supplied an invalid update command.', :update) if raw_command !~ /^(all|files|bundle|pow|get|env)$/
-        command = $1.to_sym
-      else
-        command = :all
-      end
+      ARGV[1] !~ /^(all|files|bundle|pow|get|env)$/i || error('You supplied an invalid update command.', :update)
+      command = $1.to_sym
 
       (!app_id or app_id == 'all') ? run(:update, command) : update_app(app_id, command)
 
@@ -93,9 +84,11 @@ class Fanforce::CLI
     #################################################################
 
     elsif ARGV[0] == 'push'
-      ARGV[1] =~ /^(all|development|staging|production)$/ || error('You supplied an invalid push command.', :push)
+      ARGV[1] =~ /^(all|development|staging|production)$/i || error('You supplied an invalid push command.', :push)
       environment = $1.to_sym
-      command = (ARGV[2] =~ /(:all|:heroku|:iron|bitbucket)$/) ? $1.to_sym : :all
+
+      ARGV[2] =~ /^(all|heroku|iron|bitbucket)$/i || error('You supplied an invalid push command.', :push)
+      command = $1.to_sym
 
       confirm('Are you sure you want to push to all environments, including production?') if environment == :all
       confirm('Are you sure you want to push to production?') if environment == :production
@@ -139,15 +132,12 @@ class Fanforce::CLI
     #################################################################
 
     elsif ARGV[0] == 'iron'
-      ARGV[1] =~ /^(upload|reset|delete)$/ || error('You supplied an invalid iron command.', :iron)
+      ARGV[1] =~ /^(upload|reset|delete)$/i || error('You supplied an invalid iron command.', :iron)
       command = $1.to_sym
 
-      if ARGV[2].blank? or ARGV[2] =~ /^(all|development|staging|production)$/
-        environment = ($1.present?) ? $1.to_sym : :all
-        confirm("Are you sure you want to #{command} workers in all environments?") if environment == :all
-      else
-        error('You supplied an invalid iron environment.', :iron)
-      end
+      ARGV[2] =~ /^(all|development|staging|production)$/i || error('You supplied an invalid iron environment.', :iron)
+      environment = $1.to_sym
+      confirm("Are you sure you want to #{command} workers in all environments?") if environment == :all
 
       if command == :delete
         delete_all_iron_workers(environment)

data/lib/fanforce/cli/commands.rb

@@ -203,7 +203,7 @@ class Fanforce::CLI
       environments = (environment==:all) ? [:staging,:production] : [environment]
       environments.each do |environment|
         if [:all,:heroku].include?(command)
-          remote_name = "#{environment==:staging ? 'stg' : 'prd'}-heroku"
+          remote_name = "#{env(environment)}-heroku"
           setup_heroku(app, environment) if !(`git remote`).split(/\r?\n/).include?(remote_name)
 
           vars = Env.vars_by_app(environment)[app.dir_name] || {}
@@ -469,10 +469,6 @@ class Fanforce::CLI
   end
 
   ######################################################################################################################
-  def get_heroku_app_qa_name(app, environment)
-    heroku_app_name = "#{environment==:production ? 'prd' : 'qa'}-#{app.dir_name}"
-    heroku_app_name.length > 30 ? heroku_app_name.gsub!(/(a|e|i|o|u)/, '') : heroku_app_name
-  end
 
   def run_upgrade(app_dir, processed_count, total_count)
     environment = :qa

data/lib/fanforce/cli/commands_support.rb

@@ -1,11 +1,6 @@
 class Fanforce::CLI
   require 'fileutils'
 
-  def get_heroku_app_name(app, environment)
-    heroku_app_name = "#{environment==:production ? 'prd' : 'stg'}-#{app.dir_name}"
-    heroku_app_name.length > 30 ? heroku_app_name.gsub!(/(a|e|i|o|u)/, '') : heroku_app_name
-  end
-
   def setup_files(app)
     if File.directory?("#{app.dir}/tmp")
       puts "#{'Found  '.format(:green,:bold)} #{app.dir_name}/tmp/"
@@ -145,7 +140,7 @@ class Fanforce::CLI
     heroku.put_config_vars(heroku_app_name, vars) if vars
 
     # Setup standard app domain
-    domain = "#{app._id}.#{Fanforce.apps_base_domain}"
+    domain = "#{app._id}.#{Fanforce::DomainEnvironments.method(environment).call[:apps_base]}"
     domain_found = heroku.get_domains(heroku_app_name).body.inject(false) {|result, d| d['domain'] == domain ? (break true) : false }
     if domain_found
       puts "#{'Found   '.format(:green,:bold)}" + "#{domain} domain on #{environment}"
@@ -155,7 +150,7 @@ class Fanforce::CLI
     end
 
     # Setup default short domain
-    domain = "#{app._id}.#{Fanforce.default_short_domain}"
+    domain = "#{app._id}.#{Fanforce::DomainEnvironments.method(environment).call[:default_short_domain]}"
     domain_found = heroku.get_domains(heroku_app_name).body.inject(false) {|result, d| d['domain'] == domain ? (break true) : false }
     if domain_found
       puts "#{'Found   '.format(:green,:bold)}" + "#{domain} domain on #{environment}"
@@ -164,7 +159,7 @@ class Fanforce::CLI
       puts "#{'Added   '.format(:green,:bold)}" + "#{domain} domain to #{environment}"
     end
 
-    remote_name = "#{environment==:staging ? 'stg' : 'prd'}-heroku"
+    remote_name = "#{env(environment)}-heroku"
     if (`git remote`).split(/\r?\n/).include?(remote_name)
       puts "#{'Updated '.format(:green,:bold)}" + "git remote for #{remote_name}"
       `git remote rm #{remote_name}`

data/lib/fanforce/cli/help.rb

@@ -17,6 +17,7 @@ module Fanforce::CLI::Help
 
   def for(command, allowed_commands)
     response  = "\n#{command.to_s.upcase} COMMAND...\n-----------------------------------------------------------------------------------------------------------------------\n"
+    response += self.method("#{command}_command").call
     response += "-----------------------------------------------------------------------------------------------------------------------\n\n"
   end
 
@@ -31,12 +32,12 @@ create     app-ID                                   Creates a new app folder and
   end
 
   def update_command; <<-eos
-update     *all|app-ID  [*all|OR...]                Similar to the create command, except it updates existing files
-                             |files                 Ensure all needed files exists and contain correct config
-                             |bundle                Run bundle install
-                             |pow                   Ensure correct pow domains are configured
-                             |git                   Ensure git is initialized
-                             |env                   Update ENV variables
+update     app-ID|all    all|OR...                  Similar to the create command, except it updates existing files
+                            |files                  Ensure all files exist and contain correct config
+                            |bundle                 Run bundle install
+                            |pow                    Ensure correct pow domains are configured
+                            |git                    Ensure git is initialized
+                            |env                    Update ENV variables
   eos
   end
 
@@ -46,11 +47,11 @@ delete     app-ID                                   Delete the app folder and al
   end
 
   def push_command; <<-eos
-push       development|RACK_ENV  [*all|OR...]       Push all changes to the environment specified
-                                      |env          Update environment vars in remote environments
-                                      |bitbucket    Push the latest commit to bitbucket
-                                      |heroku       Push the latest commit to heroku and restart
-                                      |iron         Push changes to workers
+push       RACK_ENV       all|OR...                 Push all changes to the environment specified
+                             |env                   Update environment vars in remote environments
+                             |bitbucket             Push the latest commit to bitbucket
+                             |heroku                Push the latest commit to heroku and restart
+                             |iron                  Push changes to workers
   eos
   end
 
@@ -65,7 +66,7 @@ count                                               Display the number of fanfor
   end
 
   def bundle_command; <<-eos
-bundle     (install|update)                         Run bundle on all apps in current fanforce
+bundle     install|update                           Run bundle on all apps in current fanforce
   eos
   end
 
@@ -76,7 +77,7 @@ git        status:overview                          A custom git command that di
   end
 
   def iron_command; <<-eos
-iron       (upload|reset|delete) [*all|RACK_ENV]    Updates env variables and upload one or more workers to iron.io
+iron       upload|reset|delete    RACK_ENV|all      Updates env variables and upload one or more workers to iron.io
   eos
   end
 
@@ -91,7 +92,7 @@ config                                              Display your Fanforce CLI co
   end
 
   def cleanorgs_command; <<-eos
-cleanorgs  environment supercore_api_key            Remove installs that are no longer valid in the db
+cleanorgs  environment   supercore_api_key          Remove installs that are no longer valid in the db
   eos
   end
 

data/lib/fanforce/cli/utils.rb

@@ -42,6 +42,25 @@ module Fanforce::CLI::Utils
     exit 0 if input.downcase == 'n'
   end
 
+  def env(environment)
+    return if environment.blank?
+    is_symbol = environment.is_a?(Symbol)
+    env = case environment.to_sym
+            when :development then :dev
+            when :staging then :stg
+            when :production then :prd
+            else raise 'unknown environment'
+          end
+    is_symbol ? env : env.to_s
+  end
+
+  def get_heroku_app_name(app, environment)
+    raise 'unknown environment' if ![:production, :staging].include?(environment)
+
+    heroku_app_name = "#{env(environment)}-#{app.dir_name}"
+    heroku_app_name.length > 30 ? heroku_app_name.gsub!(/(a|e|i|o|u)/, '') : heroku_app_name
+  end
+
 end
 
 class String

data/lib/fanforce/cli/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class CLI
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis