fanforce-cli 1.7.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c4873bb599d4f3f889d47901b18f4b6d4f03b9
-  data.tar.gz: fe2f8930277bec0d1a860d3dbaf0e191e91d3734
+  metadata.gz: 4d77a2b3fde1139385186a6bf61a894d4e0bcc75
+  data.tar.gz: 087070dc87ad1127e0743cab3f3a7b1043fd79e6
 SHA512:
-  metadata.gz: c9e7bcf5ed5275f458567814cb0f96a794d20b13483bf842f8c711f9629ff7c8efb116e3cd7c3b7c461d3ab7f4da2ed7810a343a4f0524775a8fc1a5de2af483
-  data.tar.gz: 77a079d7a5b05e090eb3b34925bfe77ed450f1d68ea1d05499cb2ff97857482305853b1ab10caf31cbdce70d43a948259455d58daf9abd4408609884c3f70577
+  metadata.gz: 6cc548a9940a6925b881c5f83ee5aaa9792ba8bb99838e36a6e3b5d5ec750fab85bac3306ca1768e804bff588bcd1db6d3430ebb127c2bf76c191e1b600c3327
+  data.tar.gz: 398dfd0ab93eb0225cf9154db80bf82597b49f3eb91d8560dcb925f790be6b50f6daa2275f97156045c4c921febc4e05d23b862259fee34777935d9bb174c009

data/Gemfile.lock

@@ -1,85 +1,27 @@
 PATH
   remote: .
   specs:
-    fanforce-cli (1.0.0)
+    fanforce-cli (2.0.0.rc1)
       activesupport
-      bitbucket_rest_api
-      fanforce-api
-      heroku-api (= 0.3.8)
-      iron_worker_ng
-      multi_json
-      redis
-      rest-client
+      fanforce-base (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.4)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    activesupport-inflector (0.1.0)
-    bitbucket_rest_api (0.1.5)
-      faraday (~> 0.8.1)
-      faraday_middleware (~> 0.9.0)
-      hashie (~> 2.0.5)
-      multi_json (~> 1.3)
-      nokogiri (>= 1.5.2)
-      simple_oauth
-    excon (0.16.10)
-    fanforce (0.19.0)
-      multi_json (>= 1.7.2)
+    addressable (2.3.6)
+    fanforce-base (1.2.2)
+      addressable (~> 2.3.6)
       rack
-    fanforce-api (0.23.0)
-      fanforce-exceptions (~> 0.5)
-      fanforce-validations (~> 0.7)
-      rest-client (~> 1.6.7)
-    fanforce-exceptions (0.5.1)
-      fanforce (~> 0.15)
-    fanforce-validations (0.7.1)
-      activesupport-inflector (~> 0.1)
-      fanforce (~> 0.15)
-      fanforce-exceptions (~> 0.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (2.0.5)
-    heroku-api (0.3.8)
-      excon (~> 0.16.10)
     i18n (0.6.11)
-    iron_core (1.0.5)
-      rest (>= 2.6.4)
-    iron_worker_ng (1.5.0)
-      bundler
-      iron_core (>= 1.0.0)
-      rubyzip (= 0.9.9)
     json (1.8.1)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
-    multi_json (1.10.1)
-    multipart-post (1.2.0)
-    net-http-persistent (2.9.4)
-    netrc (0.7.7)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    minitest (5.4.3)
     rack (1.5.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    redis (3.1.0)
-    rest (2.7.2)
-      net-http-persistent (>= 2.9.1)
-      rest_client (>= 1.7.1)
-    rest-client (1.6.8)
-      mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
-    rest_client (1.7.3)
-      netrc (~> 0.7.7)
-    rubyzip (0.9.9)
-    simple_oauth (0.2.0)
     thread_safe (0.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/bin/fanforce

@@ -1,20 +1,4 @@
 #!/usr/bin/env ruby
 require 'fanforce/cli'
 
-fanforce = Fanforce::CLI.new('fanforce')
-
-if File.exists?("#{$HomeDir}/config.ru") and File.exists?("#{$HomeDir}/../.fanforce-cli")
-  ARGV.unshift(":#{File.basename($HomeDir)}")
-  $HomeDir = File.expand_path('..', $HomeDir)
-  fanforce.start(
-      :runtype => :single,
-      :allowed => [:update, :push, :restart, :bundle, :git, :iron, :version, :config, :cleanorgs, :upgrade],
-  )
-elsif File.exists?("#{$HomeDir}/.fanforce-cli")
-  fanforce.start(
-      :runtype => :multiple,
-      :allowed => [:list, :create, :delete, :update, :push, :restart, :count, :bundle, :git, :iron, :version, :config, :cleanorgs, :upgrade],
-  )
-else
-  puts 'NOT A VALID DIRECTORY'
-end
+Fanforce::CLI.new('fanforce', :standard)

data/fanforce-cli.gemspec

@@ -2,30 +2,22 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fanforce/cli/version'
-require 'rubygems'
 
 Gem::Specification.new do |gem|
-  gem.name          = 'fanforce-cli'
-  gem.version       = Fanforce::CLI::VERSION
-  gem.authors       = ['Caleb Clark']
-  gem.email         = ['cclark@mobilizationlabs.com']
-  gem.description   = %q{CLI for managing a folder of Fanforce apps}
-  gem.summary       = %q{Manage a folder of Fanforce apps}
-  gem.homepage      = ''
+  gem.name     = 'fanforce-cli'
+  gem.version  = Fanforce::CLI::VERSION
+  gem.date     = Time.now.utc.strftime('%Y-%m-%d')
+  gem.summary  = %q{command-line interface for fanforce developers}
+
+  gem.authors  = ['Caleb Clark']
+  gem.email    = ['cclark@mobilizationlabs.com']
+  gem.homepage = 'http://github.com/fanforce/gem-fanforce-cli'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = ['fanforce','fanforce-supercharge']
+  gem.executables   = ['fanforce'] #,'fanforce-supercharge'
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'redis'
-  gem.add_dependency 'rest-client'
-  gem.add_dependency 'iron_worker_ng'
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'heroku-api', '0.3.8'
-  gem.add_dependency 'multi_json'
-  gem.add_dependency 'bitbucket_rest_api'
-  gem.add_dependency 'fanforce'
-  gem.add_dependency 'fanforce-api'
-
+  gem.add_dependency 'fanforce-base', '~> 1.2'
 end

data/lib/fanforce/cli.rb

@@ -1,12 +1,7 @@
-require 'active_support/all'
-require 'optparse'
-require 'shell'
-require 'rest-client'
-require 'multi_json'
-require 'bitbucket_rest_api'
-require 'heroku-api'
-require 'yaml'
-require 'fanforce'
+require 'fanforce/base'
 
 require_relative 'cli/version'
-require_relative 'cli/_base'
+require_relative 'cli/utils'
+require_relative 'cli/app'
+require_relative 'cli/apps'
+require_relative 'cli/_load'

data/lib/fanforce/cli/_load.rb

@@ -0,0 +1,177 @@
+require 'active_support/all'
+require 'shell'
+require 'fanforce/cli/utils'
+
+class Fanforce::CLI
+  include Fanforce::CLI::Utils
+
+  DIR = Shell.new.pwd
+  TYPE = Fanforce::CLI::Utils.find_cli_type(DIR)
+
+  @@commands = {}
+  @@docs = []
+  @@has_finished_loading_internal_commands = false
+
+  def initialize(executable, runtype)
+    @executable = executable
+    @runtype = runtype
+
+    start_spinner
+    load_cli_commands
+  end
+
+  def start_spinner
+    @spinner_output = ''
+    @spinner = Thread.new do
+      print @spinner_output
+      i = 0
+      loop do
+        i += 1
+        if (i%100) == 0
+          print ("\b"*@spinner_output.size) + (' '*@spinner_output.size) + ("\b"*@spinner_output.size)
+          @spinner_output = ''
+        else
+          @spinner_output += '.'
+          print '.'
+        end
+        sleep 0.1
+      end
+    end
+  end
+
+  def stop_spinner
+    Thread.kill(@spinner)
+    print ("\b"*@spinner_output.size) + (' '*@spinner_output.size) + ("\b"*@spinner_output.size)
+  end
+
+  def get_parent_dir(current_dir)
+    File.expand_path('..', current_dir)
+  end
+
+  def load_cli_commands
+    require_relative 'scripts/version'
+
+    if TYPE == :directory_of_apps
+      begin
+        require 'fanforce/app_factory/cli_directory_of_apps'
+      rescue LoadError => e
+        raise if !e.message.include?('fanforce/app_factory/cli_directory_of_apps')
+        error('You must install the fanforce-app-factory gem (> 2.0) for use in this folder')
+      end
+    elsif TYPE == :single_app
+      begin
+        require 'fanforce/app_factory/cli_single_app'
+      rescue LoadError => e
+        raise if !e.message.include?('fanforce/app_factory/cli_single_app')
+        error('You must install the fanforce-app-factory gem (> 2.0) for use in an app folder')
+      end
+    end
+
+    @@has_finished_loading_internal_commands = true
+
+    dir_to_check = Dir.pwd
+    while dir_to_check do
+      cli_scripts_dir = "#{dir_to_check}/.cli-scripts"
+      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)
+    end
+
+    print_docs_and_exit if ARGV.size == 0
+
+    command = @@commands[ARGV.shift.to_sym] || (error 'Unknown command')
+    run(command, *ARGV)
+  end
+
+  def self.register(klass, command, *raw_docs, &block)
+    path_to_caller = caller[0].split(':')[0]
+    if @@commands[command]
+      error("Trying to register \"#{command}\" command, but it has already been registered...\n" +
+            "  1st: #{@@commands[command][:path_to_caller]}\n" +
+            "  2nd: #{path_to_caller}"
+      )
+    end
+    error "#{command} is missing docs" if raw_docs.size == 0
+    if raw_docs.size == 1
+      raw_doc = raw_docs[0]
+      doc_columns = (raw_doc[0] || '').strip.split(/\s+/)
+      doc_columns.fill('', doc_columns.size...2) if doc_columns.size < 2
+      doc_columns.push(raw_doc[1])
+      rows = [doc_columns]
+    else
+      rows = []
+      raw_docs.each do |raw_doc|
+        next if !raw_doc
+        doc_columns = (raw_doc[0] || '').strip.split(/\s+/)
+        doc_columns.fill('', doc_columns.size...2) if doc_columns.size < 2
+        doc_columns.push(raw_doc[1])
+        rows << doc_columns
+      end
+    end
+    doc = {command: command, rows: rows, is_local: @@has_finished_loading_internal_commands || false}
+    @@docs << doc
+    @@commands[command] = {klass: klass, method: command, block: block, doc: doc, path_to_caller: path_to_caller}
+  end
+
+  def print_docs_and_exit
+    commands = []
+    local_commands = []
+    @@docs.each do |doc|
+      tmp_column1 = nil
+      doc[:rows].each_with_index do |columns, row_i|
+        columns.unshift(row_i==0 ? doc[:command] : '')
+        columns[1]==tmp_column1 ? columns[1] = '' : tmp_column1 = columns[1] if doc[:rows].size > 1
+        doc[:is_local] ? local_commands << columns : commands << columns
+      end
+    end
+
+    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 += "\n\n\nFACTORY COMMANDS..."
+
+    format_command = lambda {|columns|
+      formatted_docs += divider '+-' if columns[0].present?
+      if columns[2].present?
+        template = "\n%-12s %-15s %-25s %-50s"
+      else
+        columns.delete_at(2)
+        template = "\n%-12s %-41s %-50s"
+      end
+      formatted_docs += sprintf(template, *columns)
+    }
+
+    commands.each {|columns| format_command.call(columns.clone) }
+
+    if local_commands.size > 0
+      formatted_docs += divider '+-+++'
+      formatted_docs += 'LOCAL COMMANDS...'
+      local_commands.each {|columns| format_command.call(columns.clone) }
+    end
+
+    formatted_docs += divider '+-+++'
+    stop_spinner
+    puts formatted_docs
+    exit
+  end
+
+  ######################################################################################################################
+
+  def run(command, *args)
+    command[:block].call if command[:block]
+    stop_spinner
+    self.method("run_#{@runtype}").call(command[:klass], command[:method], *args)
+  end
+
+  def run_standard(klass, method, *args)
+    instance = klass.new
+    instance.send(method, *args)
+  rescue ArgumentError => e
+    arity = instance.method(method).arity
+    raise if (arity >= 0 and arity == args.size) or ((arity < 0) and arity < -args.size)
+    error "Incorrect command for #{method}: #{e.message}", method
+  end
+
+end
+

data/lib/fanforce/cli/app.rb

@@ -1,44 +1,42 @@
 class Fanforce::CLI::App
-  attr_reader :_id, :dir, :dir_name, :dir_root, :root_domain
+
+  attr_reader :_id, :dir, :dir_name, :dir_root, :root_domain, :name
 
   def self.parse_dir_name(dir_name)
     return if dir_name !~ /^(app-([a-z0-9-]+))\/?$/
     {_id: $2, dir_name: $1}
   end
 
-  def self.load(dir)
-    self.new(dir)
-  end
+  def self.load(dir); self.new(dir) end
+
+  ######################################################################################################################
 
   def initialize(dir)
-    raise "This is an invalid directory name for a fanforce addon: #{dir}" if dir !~ /^(.*)\/(app-([a-z0-9-]+))\/?$/
-    @_id         = $3
+    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
   end
 
-  def create_files(*filenames)
-    filenames.each do |filename|
-      Fanforce::CLI::Files.method(:"create_#{filename}").call(self)
-    end
-  end
-  alias create_file create_files
-
-  def update_files(*filenames)
-    filenames.each do |filename|
-      Fanforce::CLI::Files.method(:"update_#{filename}").call(self)
+  def config
+    @config ||= begin
+      file_path = "#{@dir}/config.json"
+      return {} if !File.exists?(file_path)
+      file = File.open(file_path).read
+      MultiJson.load(file, symbolize_keys: true)
     end
   end
-  alias update_file update_files
 
   def to_hash
     {
         _id: @_id,
+        name: @name,
         dir_name: @dir_name,
         dir_root: @dir_root,
-        dir: @dir,
+        dir: @dir
     }
   end
 
@@ -46,12 +44,4 @@ class Fanforce::CLI::App
     to_hash.to_json
   end
 
-  def start_print
-    print "- #{@dir_name}... "
-  end
-
-  def end_print
-    puts 'DONE'
-  end
-
 end

data/lib/fanforce/cli/apps.rb

@@ -1,41 +1,32 @@
 class Fanforce::CLI::Apps
-  require 'singleton'
-  require 'forwardable'
-  include Singleton
 
-  def dir_names
-    @dirs ||= Dir.chdir($HomeDir) do Dir['*/'].inject([]) do |dirs, d|
+  @@dirs = nil
+
+  def self.dir_names
+    @@dirs ||= Dir.chdir(Fanforce::CLI::DIR) do Dir['*/'].inject([]) do |dirs, d|
       d = d.gsub('/', '')
-      next dirs if d !~ /^(app-[a-z0-9-]+)\/?$/
-      next dirs << d if $Filter.blank?
-      next dirs << d if $Filter[:dir_name].present? and $Filter[:dir_name] == d
-      next dirs
+      (d =~ /^([a-z0-9-]+)\/?$/) ? dirs << d : dirs
     end end
   end
 
-  def dirs
+  def self.dirs
     dir_names.inject([]) do |result, d|
-      result << "#{$HomeDir}/#{d}"
+      result << "#{Fanforce::CLI::DIR}/#{d}"
     end
   end
 
-  def each(&block)
+  def self.each(&block)
     cur_count = 0
     total = dir_names.size
     dir_names.each do |d|
       cur_count += 1
-      app = Fanforce::CLI::App.load("#{$HomeDir}/#{d}")
+      app = Fanforce::CLI::App.load("#{Fanforce::CLI::DIR}/#{d}")
       Dir.chdir(app.dir) { block.call(app, cur_count, total) }
     end
   end
 
-  def count
+  def self.count
     dir_names.size
   end
 
-  class << self
-    extend Forwardable
-    def_delegators :instance, *Fanforce::CLI::Apps.instance_methods(false)
-  end
-
 end