fanforce-cli 1.7.1 → 2.0.0.rc1

data/lib/fanforce/cli/scripts/version.rb

@@ -0,0 +1,12 @@
+class Fanforce::CLI::Scripts
+  include Fanforce::CLI::Utils
+
+  Fanforce::CLI.register self, :version, [nil, 'Display your current Fanforce CLI version number']
+
+  def version(*args)
+    puts divider '++----------------------------------------------------------------------------------------------------'
+    puts "You are using Fanforce::CLI v#{Fanforce::CLI::VERSION}"
+    puts divider '----------------------------------------------------------------------------------------------------++'
+  end
+
+end

data/lib/fanforce/cli/utils.rb

@@ -1,70 +1,90 @@
 module Fanforce::CLI::Utils
-  extend Fanforce::CLI::Utils
+  extend self
+  def self.included(base) base.extend(self) end
 
-  def format(text, *args)
+  def divider(template)
+    line_width = 150
+    line_width = line_width - $1.size if template =~ /(\s+)[=-]+/
+    template.gsub('+', "\n").gsub(/[-]+/, '-' * line_width).gsub(/[=]+/, '=' * line_width)
+  end
+
+  def log(msg='')
+    puts msg
+  end
+
+  def error(msg, command=nil)
+    puts divider '+-+'
+    puts 'ERROR '.format(:red,:bold) + msg
+    puts divider '-++'
+    exit
+  end
+
+  def fmt(text, *args)
+    "#{fmt_start(*args)}#{text}#{fmt_end}"
+  end
+
+  def fmt_start(*args)
     effect = args.include?(:bold) ? 1 : 0
     color = if    args.include?(:red) then 31
             elsif args.include?(:green) then 32
             elsif args.include?(:magenta) then 35
             else  39 end
-    "\033[#{effect};#{color}m#{text}\033[0m"
+    "\033[#{effect};#{color}m"
   end
 
-  def format_config(hash)
-    hash.values.select{|v| v.is_a? Hash}.each{|h| format_config(h)}
-    hash.symbolize_keys!
+  def fmt_end
+    "\033[0m"
   end
 
-  def unknown
-    puts '---------------------------------------------------------------------------------------------------------------'
-    puts 'OOPS'.format(:bold,:red) + '... unknown command'.format(:red)
-    puts Fanforce::CLI::Help.commands(@allowed_commands)
-    exit 1
-  end
-
-  def error(msg, command=nil)
-    puts '---------------------------------------------------------------------------------------------------------------'
-    puts 'ERROR... '.format(:bold,:red) + msg
-    puts '---------------------------------------------------------------------------------------------------------------'
-    puts ''
-    if command.present?
-      puts Fanforce::CLI::Help.for(command, @allowed_commands)
-    else
-      puts Fanforce::CLI::Help.commands(@allowed_commands)
-    end
-    exit 1
-  end
-
-  def confirm(msg)
-    puts '---------------------------------------------------------------------------------------------------------------'
+  def confirm(msg, exit_unless_confirmed=true)
     print "#{msg} [y/n]: "
     input = $stdin.gets.strip
-    exit 0 if input.downcase == 'n'
+    confirmed = !input.downcase.include?('n')
+    (!confirmed && exit_unless_confirmed) ? exit(0) : confirmed
   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
+  def prompt(msg, required=false)
+    print "#{msg}"
+    response = $stdin.gets.strip
+    (required && response.blank?) ? prompt(msg, required) : response
   end
 
-  def get_heroku_app_name(app, environment)
-    raise 'unknown environment' if ![:production, :staging].include?(environment)
+  def find_cli_type(home_dir)
+    dir_names = home_dir.split('/')
+    types = {
+        directory_of_internals: false,
+        single_internal: false,
+        directory_of_apps: false,
+        single_app: false
+    }
+
+    types[:single_app] = true if File.exists?("#{home_dir}/config.json") and File.exists?("#{home_dir}/../.fanforce-app-factory")
+    types[:directory_of_apps] = true if File.exists?("#{home_dir}/.fanforce-app-factory")
+
+    if [dir_names[-1],dir_names[-2]].include?('Fanforce') && !File.exists?("#{home_dir}/.git") && !File.exists?("#{home_dir}/.fanforce-app-factory")
+      types[:directory_of_internals] = true
+    end
+
+    if [dir_names[-1],dir_names[-2],dir_names[-2]].include?('Fanforce') and File.exists?("#{home_dir}/.git") and !File.exists?("#{home_dir}/../.fanforce-app-factory")
+      types[:single_internal] = true
+    end
+
+    found_types = types.inject([]) {|found_types, (key,bool)| bool ? found_types << key : found_types }
+
+    if found_types.size != 1
+      divider '+-'
+      (found_types.size == 0) ? log('COULD NOT DEDUCE CLI TYPE') : log("CONFLICTING CLI TYPES: #{found_types.to_s}")
+      divider '+-'
+      exit
+    end
 
-    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
+    return found_types.first
   end
 
 end
 
 class String
   def format(*args)
-    Fanforce::CLI::Utils.format(self, *args)
+    Fanforce::CLI::Utils.fmt(self, *args)
   end
 end

data/lib/fanforce/cli/version.rb

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

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: iron_worker_ng
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -67,81 +25,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: heroku-api
+  name: fanforce-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bitbucket_rest_api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fanforce
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fanforce-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: CLI for managing a folder of Fanforce apps
+        version: '1.2'
+description: 
 email:
 - cclark@mobilizationlabs.com
 executables:
 - fanforce
-- fanforce-supercharge
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,21 +54,15 @@ files:
 - README.md
 - Rakefile
 - bin/fanforce
-- bin/fanforce-supercharge
 - fanforce-cli.gemspec
 - lib/fanforce/cli.rb
-- lib/fanforce/cli/_base.rb
+- lib/fanforce/cli/_load.rb
 - lib/fanforce/cli/app.rb
 - lib/fanforce/cli/apps.rb
-- lib/fanforce/cli/commands.rb
-- lib/fanforce/cli/commands_support.rb
-- lib/fanforce/cli/env.rb
-- lib/fanforce/cli/files.rb
-- lib/fanforce/cli/help.rb
-- lib/fanforce/cli/run.rb
+- lib/fanforce/cli/scripts/version.rb
 - lib/fanforce/cli/utils.rb
 - lib/fanforce/cli/version.rb
-homepage: ''
+homepage: http://github.com/fanforce/gem-fanforce-cli
 licenses: []
 metadata: {}
 post_install_message: 
@@ -181,13 +76,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Manage a folder of Fanforce apps
+summary: command-line interface for fanforce developers
 test_files: []
+has_rdoc: 

data/bin/fanforce-supercharge

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-require 'fanforce/cli'
-
-Fanforce::CLI.new('fanforce-supercharge').start(
-    :runtype => :forked,
-    :allowed => [:update, :push, :restart, :bundle, :git, :iron, :version, :config, :cleanorgs],
-)

data/lib/fanforce/cli/_base.rb

@@ -1,263 +0,0 @@
-require 'iron_worker_ng'
-require 'fanforce/cli'
-
-class Fanforce::CLI
-  require 'fanforce/cli/utils'
-  require 'fanforce/cli/files'
-  require 'fanforce/cli/app'
-  require 'fanforce/cli/apps'
-  require 'fanforce/cli/run'
-  require 'fanforce/cli/env'
-  require 'fanforce/cli/help'
-  require 'fanforce/cli/commands'
-  include Fanforce::CLI::Utils
-
-  def initialize(executable)
-    @executable = executable
-    $HomeDir = Shell.new.pwd
-  end
-
-  def start(options)
-    @runtype = options[:runtype]
-    @allowed_commands = options[:allowed]
-    setup_config
-    init_counter(Process.pid) if @runtype == :forked
-    parse_app_filter
-    parse_command
-    destroy_counter(Process.pid) if @runtype == :forked
-  end
-
-  def setup_config
-    puts 'ERROR: Fanforce CLI could not find the required config file.'.format(:red) if !File.exists?("#{$HomeDir}/.fanforce-cli")
-    $Config = format_config(YAML.load_file("#{$HomeDir}/.fanforce-cli"))
-  end
-
-  def parse_app_filter
-    if ARGV[0] =~ /^:((app)-(.+))$/
-      $Filter = {dir_name: $1}
-      ARGV.shift
-    end
-  end
-
-  #################################################################################
-
-  def parse_command
-
-    #################################################################
-
-    if ARGV.length == 0 or !@allowed_commands.include?(ARGV[0].to_sym)
-      puts Fanforce::CLI::Help.intro(@executable, @runtype)
-      puts Fanforce::CLI::Help.commands(@allowed_commands)
-
-      #################################################################
-
-    elsif ARGV[0] == 'list'
-      list_apps
-
-    #################################################################
-
-    elsif ARGV[0] == 'create'
-      ARGV[1] =~ /^app-([a-z0-9-]+)$/i || error('You supplied an invalid create command.', :create)
-      create_app($1)
-
-    #################################################################
-
-    elsif ARGV[0] == 'update'
-      ARGV[1] =~ /^(all|files|bundle|pow|get|env)$/i || error('You supplied an invalid update command.', :update)
-      run(:update, $1.to_sym)
-
-    #################################################################
-
-    elsif ARGV[0] == 'delete'
-      ARGV[1] =~ /^app-([a-z0-9-]+)$/ || error('You supplied an invalid delete command.', :delete)
-      confirm("Are you sure you want to delete all files, repositories, and other items for #{ARGV[1]}?")
-      delete_app($1)
-
-    #################################################################
-
-    elsif ARGV[0] == 'push'
-      ARGV[1] =~ /^(all|development|staging|production)$/i || error('You supplied an invalid push command.', :push)
-      environment = $1.to_sym
-
-      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
-      confirm("Are you sure you want to push to all services on #{environment}?") if command == :all
-
-      run(:push, environment, command)
-
-      #################################################################
-
-    elsif ARGV[0] == 'restart'
-      if ARGV[1].present?
-        ARGV[1] =~ /^(development|staging|production|all)?$/ || error('You supplied an invalid restart command.', :restart)
-        environment = $1.to_sym
-      else
-        environment = :development
-      end
-
-      confirm('Are you sure you want to restart all environments?') if environment == :all
-      run(:restart, environment)
-
-    #################################################################
-
-    elsif ARGV[0] == 'count'
-      count
-
-    #################################################################
-
-    elsif ARGV[0] == 'bundle'
-      ARGV[1] =~ /^(install|update)$/ || error('You supplied an invalid bundle command.', :bundle)
-
-      run(:bundle, $1.to_sym, ARGV[3..-1] || [])
-
-    #################################################################
-
-    elsif ARGV[0] == 'git' and ARGV[1] == 'status:overview'
-      run(:git_overview)
-
-    elsif ARGV[0] == 'git'
-      run(:git, ARGV[1..-1] || [])
-
-    #################################################################
-
-    elsif ARGV[0] == 'iron'
-      ARGV[1] =~ /^(upload|reset|delete)$/i || error('You supplied an invalid iron command.', :iron)
-      command = $1.to_sym
-
-      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)
-      else
-        run(:iron, command, environment)
-      end
-
-    #################################################################
-
-    elsif ARGV[0] == 'cleanorgs'
-      ARGV[1] =~ /^(development|staging|production)$/ || error('You supplied an invalid cleanorgs command.', :cleanorgs)
-      environment = $1.to_sym
-
-      supercore_api_key = ARGV[2] || error('You supplied an invalid cleanorgs command.', :cleanorgs)
-
-      run(:cleanorgs, environment, supercore_api_key)
-
-     #################################################################
-
-    elsif ARGV[0] == 'version'
-      puts '---------------------------------------------------------------------------------------------------------------'
-      puts "You are using version #{Fanforce::CLI::VERSION} of Fanforce CLI"
-      puts '---------------------------------------------------------------------------------------------------------------'
-
-    elsif ARGV[0] == 'config'
-      puts '---------------------------------------------------------------------------------------------------------------'
-      if !File.exists?("#{$HomeDir}/.fanforce-cli")
-        puts 'Oops'.format(:red,:bold) + '... no ".fanforce-cli" file was found in this directory.'.format(:red)
-      else
-        puts $Config
-      end
-      puts '---------------------------------------------------------------------------------------------------------------'
-
-    elsif ARGV[0] == 'upgrade'
-      run(:upgrade)
-
-    end
-
-  end
-
-  #################################################################################
-
-  def run(method, *args)
-    (@runtype == :forked) ? run_forked(method, *args) : run_multiple(method, *args)
-  end
-
-  def run_multiple(method, *args)
-    if (dirs = Apps.dirs).size == 0
-      puts "\n---------------------------------------------------------------------------------------------------------------"
-      puts "#{'Oops'.format(:bold)}... no fanforce apps were found in this directory."
-      puts "---------------------------------------------------------------------------------------------------------------\n"
-      return
-    end
-
-    if self.respond_to?(:"preprocess_#{method}")
-      args << self.method(:"preprocess_#{method}").call
-    end
-    Apps.each do |app, processed_count, total_count|
-      self.method(:"run_#{method}").call(app.dir, processed_count, total_count, *args)
-    end
-    if self.respond_to?(:"postprocess_#{method}")
-      self.method(:"postprocess_#{method}").call
-    else
-      puts "\n---------------------------------------------------------------------------------------------------------------"
-      puts 'DONE!'
-      puts '---------------------------------------------------------------------------------------------------------------'
-    end
-  end
-
-  def run_forked(method, *args)
-    counter_id = Process.pid
-    processes = []
-    dirs = Apps.dirs
-    puts "\n---------------------------------------------------------------------------------------------------------------"
-    dirs.each_with_index do |app_dir, i|
-      puts "#{'Forking'.format(:white,:bold)} #{app_dir}"
-    end
-    dirs.each_with_index do |app_dir, i|
-      processes << fork do
-        response = capture_stdout do
-          self.method(:"run_#{method}").call(app_dir, 'PROCESSED_APPS_COUNT', dirs.size, *args)
-        end
-        puts response.gsub('PROCESSED_APPS_COUNT', incr_counter(counter_id).to_s)
-      end
-      sleep(0.25)
-    end
-
-    processes.each { |pid| Process.waitpid(pid) }
-    puts "\n---------------------------------------------------------------------------------------------------------------"
-    puts 'DONE!'
-    puts '---------------------------------------------------------------------------------------------------------------'
-  end
-
-  require 'stringio'
-  def capture_stdout
-    previous_stdout, previous_stderr = $stdout, $stderr
-    io = StringIO.new
-    $stdout = io
-    $stderr = io
-    IronCore::Logger.logger = ::Logger.new(io)
-    IronCore::Logger.logger.level = ::Logger::INFO
-    yield
-    io.string
-  ensure
-    $stdout = previous_stdout
-    $stderr = previous_stderr
-  end
-
-  def init_counter(counter_id)
-    File.open("#{$HomeDir}/.forked-counter-#{counter_id}", 'w') {|f| f.write('0') }
-  end
-
-  def incr_counter(counter_id)
-    new_count = nil
-    File.open("#{$HomeDir}/.forked-counter-#{counter_id}", File::RDWR|File::CREAT, 0644) do |f|
-      f.flock(File::LOCK_EX)
-      new_count = f.read.to_i + 1
-      f.rewind
-      f.write("#{new_count}\n")
-      f.flush
-      f.truncate(f.pos)
-    end
-    new_count
-  end
-
-  def destroy_counter(counter_id)
-    File.delete("#{$HomeDir}/.forked-counter-#{counter_id}")
-  end
-
-end
-