fanforce-cli 2.0.0.rc1 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d77a2b3fde1139385186a6bf61a894d4e0bcc75
-  data.tar.gz: 087070dc87ad1127e0743cab3f3a7b1043fd79e6
+  metadata.gz: f2b5e16173ec5a9c2a46776665016354baf4a3de
+  data.tar.gz: 042f04e77a941eb5d86e77d6d69dabed57031e36
 SHA512:
-  metadata.gz: 6cc548a9940a6925b881c5f83ee5aaa9792ba8bb99838e36a6e3b5d5ec750fab85bac3306ca1768e804bff588bcd1db6d3430ebb127c2bf76c191e1b600c3327
-  data.tar.gz: 398dfd0ab93eb0225cf9154db80bf82597b49f3eb91d8560dcb925f790be6b50f6daa2275f97156045c4c921febc4e05d23b862259fee34777935d9bb174c009
+  metadata.gz: 98104974808e0504c1688bd9ed0c459e51b1568abcf678e701d176519f5736ff8ab15df2d999594ade4aa07001254259ed8e0a750d1d00d195313bc49db7510c
+  data.tar.gz: 206a58500e0b0f759a8efa38e3c72d0681c0aba2cdbc080a55cc1e9323246ef0d9fba0e113dd828960247db9d2104e95ea722dea22b27707745a518f140ece21

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fanforce-cli (2.0.0.rc1)
+    fanforce-cli (2.0.0.rc2)
       activesupport
       fanforce-base (~> 1.2)
 

data/lib/fanforce/cli/_load.rb

@@ -5,8 +5,8 @@ require 'fanforce/cli/utils'
 class Fanforce::CLI
   include Fanforce::CLI::Utils
 
-  DIR = Shell.new.pwd
-  TYPE = Fanforce::CLI::Utils.find_cli_type(DIR)
+  DIR ||= Shell.new.pwd
+  TYPE ||= Fanforce::CLI::Utils.find_cli_type(DIR)
 
   @@commands = {}
   @@docs = []
@@ -49,8 +49,6 @@ class Fanforce::CLI
   end
 
   def load_cli_commands
-    require_relative 'scripts/version'
-
     if TYPE == :directory_of_apps
       begin
         require 'fanforce/app_factory/cli_directory_of_apps'
@@ -67,11 +65,12 @@ class Fanforce::CLI
       end
     end
 
+    require_relative 'scripts/version'
     @@has_finished_loading_internal_commands = true
 
     dir_to_check = Dir.pwd
     while dir_to_check do
-      cli_scripts_dir = "#{dir_to_check}/.cli-scripts"
+      cli_scripts_dir = "#{dir_to_check}/.cli"
       Dir["#{cli_scripts_dir}/*.rb"].each {|f| require f } if File.directory?(cli_scripts_dir)
       break if dir_to_check == '/'
       dir_to_check = get_parent_dir(dir_to_check)
@@ -127,7 +126,7 @@ class Fanforce::CLI
 
     running_as = TYPE.to_s.gsub('_', ' ')
     formatted_docs = divider '-+'
-    formatted_docs += sprintf("%-#{122-running_as.length}s (%#{running_as.length}s)", 'USAGE: fanforce <command>', running_as)
+    formatted_docs += sprintf("%-#{147-running_as.length}s (%#{running_as.length}s)", 'USAGE: fanforce <command>', running_as)
 
     formatted_docs += "\n\n\nFACTORY COMMANDS..."
 

data/lib/fanforce/cli/app.rb

@@ -13,12 +13,13 @@ class Fanforce::CLI::App
 
   def initialize(dir)
     raise "This is an invalid directory name for a fanforce addon: #{dir}" if dir !~ /^(.*)\/([a-z0-9-]+)\/?$/
-    @_id         = $2
-    @dir         = "#{$1}/#{$2}"
-    @dir_root    = $1
-    @dir_name    = $2
-    @root_domain = Fanforce.apps_base_domain
-    @name        = @_id.gsub('-', ' ').titleize
+    @_id          = $2
+    @dir          = "#{$1}/#{$2}"
+    @dir_root     = $1
+    @dir_name     = $2
+    @dir_relative = @dir.gsub(Fanforce::CLI::DIR, '')
+    @root_domain  = Fanforce.apps_base_domain
+    @name         = @_id.gsub('-', ' ').titleize
   end
 
   def config

data/lib/fanforce/cli/apps.rb

@@ -16,16 +16,16 @@ class Fanforce::CLI::Apps
   end
 
   def self.each(&block)
-    cur_count = 0
-    total = dir_names.size
+    processed_count = 0
+    total_count = dir_names.size
     dir_names.each do |d|
-      cur_count += 1
+      processed_count += 1
       app = Fanforce::CLI::App.load("#{Fanforce::CLI::DIR}/#{d}")
-      Dir.chdir(app.dir) { block.call(app, cur_count, total) }
+      Dir.chdir(app.dir) { block.call(app, processed_count, total_count) }
     end
   end
 
-  def self.count
+  def self.total_count
     dir_names.size
   end
 

data/lib/fanforce/cli/utils.rb

@@ -24,7 +24,9 @@ module Fanforce::CLI::Utils
   end
 
   def fmt_start(*args)
-    effect = args.include?(:bold) ? 1 : 0
+    effect = if    args.include?(:bold) then 1
+             elsif args.include?(:underline) then 4
+             else  0 end
     color = if    args.include?(:red) then 31
             elsif args.include?(:green) then 32
             elsif args.include?(:magenta) then 35
@@ -49,6 +51,15 @@ module Fanforce::CLI::Utils
     (required && response.blank?) ? prompt(msg, required) : response
   end
 
+  def require_gem(gem, file_to_require, retries=0)
+    require file_to_require
+  rescue LoadError => e
+    raise if retries > 0
+    puts `gem install #{gem}`
+    Gem.clear_paths
+    require_gem(gem, file_to_require, retries+1)
+  end
+
   def find_cli_type(home_dir)
     dir_names = home_dir.split('/')
     types = {

data/lib/fanforce/cli/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class CLI
-    VERSION = '2.0.0.rc1'
+    VERSION = '2.0.0.rc3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport