fanforce-factory 0.4.6 → 0.4.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTFmYWIxMTc5ZGQxZTRhNTM4NjFiZjIxZGY4OTBkZGZjYTJkNjcxOA==
+    MGY5NTY1MTYwMWUyM2ExYzg0OTZlNjQ0NWYyNzM4ZDkwYjViNTVhZg==
   data.tar.gz: !binary |-
-    NmFlYzQ4NTcxMzg1NzNkNWNmZTE2NDQ5MzkwZTJlMGEzMzEwNmY1Zg==
+    OWUwYmYwYTU2NTc3YmMyZWJiMjRmMWFkNDQwOWFjMWRkNTlhNzcyZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjgwYTkwYWVlY2JkMzgxMzdmNTE2NmM4YTMyOGY0NTdjZGFkMjRhYTZiZTM3
-    NzBkMTJjMzYyOTkzNDk1YWRjMjdiNDljYWM2ZWYwMWFmZWMyZWI5NjQ3OWJj
-    ODhmZTI5ZmQ4NWM5OTZjODdkYTJlOGRlNjYyYmE4N2UwMTk3MzA=
+    Y2M1OGRmYmY1NzRlYmI5NTZiM2NhZTUxOTllYjMxMTFjYTFmNjE2YzQ2NTk5
+    NzkyZjMzZDY5M2VkNWU5YWU0ZjExNzcwYmEzOTNmMGJkNjkyZTM3YTM0OWFm
+    ZTY0NGM5MDM4NzlmMTBmNGI0NGE0MjQyNmI2YzBhOTUyNjQ0ZmE=
   data.tar.gz: !binary |-
-    YmY1YmZjNWViMTJkM2UwMjgxNDkwMDE3NzMyYTlmOGM3MzNiMDM2N2RkMTgx
-    YjM5MjljMTU4OGNjZGQwNjEyNDA5ZDA5NWUwYTExZTEzNmQ0NmU4M2U0MTA3
-    ZmJjZjcyNTk4NTgwOTYwNjBjZGU4Zjc0OTMwYjIxZjBlNjA0NmU=
+    MDY3YWI2NDQ0ZTM0YWFkYzkwYzZjYjU2Mzc1YjJlYjkwZDBhNDhkYWE4OTcy
+    NzVkMTQ3YTlkNWY3NDg4M2ZiOGFhNTIyYTI3ZThmZjE2OTNiMmZmMzk1YWYw
+    MGUyNmQ0ZTE1M2UxMzE1OTk4NTFiNTc0M2MyM2Q5YzM1NGU3NDg=

data/bin/factory

@@ -8,11 +8,11 @@ if File.exists?("#{$HomeDir}/config.ru") and File.exists?("#{$HomeDir}/../.facto
   $HomeDir = File.expand_path('..', $HomeDir)
   factory.start(
       :runtype => :single,
-      :allowed => [:update, :restart, :push, :count, :bundle, :git, :iron, :version, :config],
+      :allowed => [:setup, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config],
   )
 else
   factory.start(
       :runtype => :realtime,
-      :allowed => [:create, :delete, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config],
+      :allowed => [:create, :setup, :delete, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config],
   )
 end

data/lib/fanforce/factory/_base.rb

@@ -46,10 +46,15 @@ class Fanforce::Factory
   #################################################################################
 
   def parse_command
+
+    #################################################################
+
     if ARGV.length == 0 or !@allowed_commands.include?(ARGV[0].to_sym)
       puts Fanforce::Factory::Help.intro(@executable, @runtype)
       puts Fanforce::Factory::Help.commands(@allowed_commands)
 
+    #################################################################
+
     elsif ARGV[0] == 'create'
       ARGV[1] =~ /^(plugin|widget|app)-(.+)$/ || error('You supplied an invalid create command.', :create)
 
@@ -70,28 +75,31 @@ class Fanforce::Factory
 
     #################################################################
 
-    elsif ARGV[0] == 'delete'
-      ARGV[1] =~ /^(plugin|widget|app)-(.+)$/ || error('You supplied an invalid delete command.', :delete)
+    elsif ARGV[0] == 'setup'
+      ARGV[1] =~ /^(plugin|widget|app)-(.+)$/ || error('You supplied an invalid setup command.', :setup)
 
-      confirm("Are you sure you want to delete all files, repositories, and other items for #{ARGV[1]}?")
-      delete_addon($1, $2)
+      addon_type = $1
+      addon_id = $2
+
+      if addon_type =~ /app|widget/
+        setup_addon(addon_type, addon_id)
+      else
+        if ARGV[2].nil?
+          error('You failed to supply a valid plugin type for setup.', :setup)
+        elsif ![:data_connector, :data_processor, :broadcaster, :identifier, :behavior].include?(ARGV[2].to_sym)
+          error('You supplied an invalid plugin type.', :setup)
+        else
+          setup_addon(addon_type, addon_id, ARGV[2])
+        end
+      end
 
     #################################################################
 
-    elsif ARGV[0] == 'setup'
-      ARGV[1] =~ /^(all|files?|envs?(:all|:development|:qa|:production)?|pows?|bitbuckets?|herokus?(:all|:qa|:production)?)$/ || error('You supplied an invalid setup command.', :setup)
+    elsif ARGV[0] == 'delete'
+      ARGV[1] =~ /^(plugin|widget|app)-(.+)$/ || error('You supplied an invalid delete command.', :delete)
 
-      tmp_str = $1
-      if tmp_str =~ /^envs?|herokus?/
-        command, environment = tmp_str.split(':').map {|d| d.singularize.to_sym }
-        environment = :all if !environment
-        confirm('Are you wanting to setup all environments?') if environment == :all
-      else
-        command = tmp_str.singularize.to_sym
-        environment = command == :all ? :all : nil
-      end
-      confirm('Are you wanting to setup everything in all environments?') if command == :all
-      run(:setup, command, environment)
+      confirm("Are you sure you want to delete all files, repositories, and other items for #{ARGV[1]}?")
+      delete_addon($1, $2)
 
     #################################################################
 

data/lib/fanforce/factory/commands.rb

@@ -7,7 +7,61 @@ class Fanforce::Factory
 
     if File.exists?("#{dir}/config.ru")
       puts '---------------------------------------------------------------------------------------------------------------'
-      puts 'ERROR... '.format(:red,:bold) + "#{addon_type}-#{addon_id} already exists. You should run: ".format(:red) + "factory update #{dir_name}".format(:green)
+      puts 'ERROR... '.format(:red,:bold) + "#{addon_type}-#{addon_id} already exists. You should run: ".format(:red) + "factory setup #{dir_name}".format(:green)
+      puts '---------------------------------------------------------------------------------------------------------------'
+      return
+    end
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'CREATING FILES...'
+    Dir.mkdir(dir) if !File.directory?(dir)
+    Dir.chdir(dir)
+    puts "#{'Created'.format(:bold, :green)} #{dir_name}/"
+    addon = Addon.load(dir, plugin_type)
+    setup_files(addon)
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'RUNNING BUNDLER...'
+    Run.bundle_install(addon.dir)
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'CREATING POW DOMAINS...'
+    setup_pow(addon)
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'CREATING LOCAL GIT REPOSITORY...'
+    Run.git_init          and puts '- git init'
+    Run.git_add           and puts '- git add .'
+    Run.git_first_commit  and puts '- git commit -m "initial factory commit"'
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'CREATING BITBUCKET REPOSITORY...'
+    setup_bitbucket addon
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'CREATING HEROKU APPS...'
+    setup_heroku addon, :qa
+    setup_heroku addon, :production
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts 'CREATING ENV VARIABLES...'
+    setup_envs(addon, :all)
+
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts "#{'DONE!'.format(:bold,:green)} Paste the following JSON into your Developer Configuration for #{addon._id.format(:bold)}:"
+    puts '---------------------------------------------------------------------------------------------------------------'
+    puts DeveloperConfig.method(addon.type).call(addon).format(:magenta)
+    puts '---------------------------------------------------------------------------------------------------------------'
+    puts "\n"
+  end
+
+  def setup_addon(addon_type, addon_id, plugin_type=nil)
+    dir_name = "#{addon_type}-#{addon_id}"
+    dir = "#{$HomeDir}/#{dir_name}"
+
+    if !File.exists?("#{dir}/config.ru")
+      puts '---------------------------------------------------------------------------------------------------------------'
+      puts 'ERROR... '.format(:red,:bold) + "#{addon_type}-#{addon_id} does not exist. You should run: ".format(:red) + "factory create #{dir_name}".format(:green)
       puts '---------------------------------------------------------------------------------------------------------------'
       return
     end
@@ -399,7 +453,10 @@ class Fanforce::Factory
           begin
             iron_worker.codes.create(code, max_concurrency: 5)
           rescue Exception => e
-            puts "#{'Aborted  '.format(:red,:bold)} uploading #{addon._id}-#{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
+            puts "#{'Aborted  '.format(:red,:bold)} upload of #{addon._id}-#{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
+            puts e.message
+            puts e.backtrace
+            puts ''
           end
 
         end

data/lib/fanforce/factory/help.rb

@@ -9,7 +9,6 @@ module Fanforce::Factory::Help
   def commands(allowed_commands)
     response  = "\n\nAVAILABLE COMMANDS...\n-----------------------------------------------------------------------------------------------------------------------\n"
     commands  = allowed_commands.map do |c|
-      c = "standalone_#{c}" if c == :update and !allowed_commands.include?(:setup)
       self.send(:"#{c}_command")
     end
     response += commands.join("-----------------------------------------------------------------------------------------------------------------------\n")
@@ -18,7 +17,6 @@ module Fanforce::Factory::Help
 
   def for(command, allowed_commands)
     response  = "\n#{command.to_s.upcase} COMMAND...\n-----------------------------------------------------------------------------------------------------------------------\n"
-    response += self.send(:"#{'standalone_' if command == :update}#{command}_command")
     response += "-----------------------------------------------------------------------------------------------------------------------\n\n"
   end
 
@@ -27,33 +25,23 @@ create     (plugin|widget|app)-ID [PLUGIN_TYPE]     Create new addon folder and
   eos
   end
 
-  def delete_command; <<-eos
-delete     (plugin|widget|app)-ID                   Delete the addon folder and all related services
-  eos
-  end
-
   def setup_command; <<-eos
-setup      (all|OR...)                              Setup all items needed for the addon
-               |files                               Create or update needed files
-               |env:[*all|RACK_ENV]                 Update environment vars for a specific environment
-               |pow                                 Ensure pow domains are setup for development environment
-               |bitbucket                           Create new repositories in bitbucket and push latest commit
-               |heroku:[*all|RACK_ENV]              Create new app in heroku account and push latest commit
+setup      (plugin|widget|app)-ID [PLUGIN_TYPE]     Similar to the create command, except it uses existing files
   eos
   end
 
-  def update_command; <<-eos
-update     ANY_SETUP_COMMAND                        Update anything that is a setup command
+  def delete_command; <<-eos
+delete     (plugin|widget|app)-ID                   Delete the addon folder and all related services
   eos
   end
 
-  def standalone_update_command; <<-eos
+  def update_command; <<-eos
 update     (all|OR...)                              Update all items
                |files                               Create or update needed files
                |env:[*all|RACK_ENV]                 Update environment vars for a specific environment
                |pow                                 Ensure pow domains are setup for development environment
-               |bitbucket                           Ensure bitbucket repositories exist and push latest commit if new
-               |heroku:[*all|RACK_ENV]              Ensure app exists in heroku account and push latest commit if new
+               |bitbucket                           Create new repositories in bitbucket and push latest commit
+               |heroku:[*all|RACK_ENV]              Create new app in heroku account and push latest commit
   eos
   end
 

data/lib/fanforce/factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Factory
-    VERSION = '0.4.6'
+    VERSION = '0.4.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-factory
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client