fanforce-factory 0.6.2 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTBhZjc0ZTU1Mzg1MTBhNzkxNDc1NDBkMjYwZGExZDZkNTkxYjhmMQ==
-  data.tar.gz: !binary |-
-    ZmExNTNhNzYyMjM0OTE0NTk1NTk1Y2FmMDFlNGIxNWFhNTVhN2RiMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    N2ZiYzkzYzc0MTJhYzQ4OGVmYTk0OGFjYTk1YzhmYjBmZTRlOTZmZWE4MTdm
-    ZTVjMjNkNDRlN2MzMzY0YTIwYzVhYTZiY2VhNmU3OTRlZmY2YWY0NGI4MWRh
-    NzU1ZWViYTM3MzE3ODg2ZGE0MTJiNTM0NjcyNTA5OWVjZWQ0OGE=
-  data.tar.gz: !binary |-
-    YjdkNTZkM2I4YjZhZmU1YjE4YTRlN2FkYTY5NzQxOTk2MmEzODY1ODE1YTEz
-    MzBjZWM2MDRmNGJjZDFlMDE5NzlhY2YwNmUxNzNhNGIxMDlkZjUyNmUzMDJl
-    MDkwMzlhZGIzNjJhMTdlMzI3ZDI2ZDEzNTkwNDg2MjI1ZDc4Y2Y=
+SHA1:
+  metadata.gz: 9648d15dda7ba2e09b30ea730425f6a004be3b3e
+  data.tar.gz: 6eca51d3cdab82532badb937fc25d8b8eae9758c
+SHA512:
+  metadata.gz: be7adf46e86bbb224193a7287e9c2ea7fd183d69b5146bc9f36fc00e9d394b8f22e1cc5436ed8f9b15eebcc353091712e8aa65c69444ac4163bdbe6fa12f43de
+  data.tar.gz: d28a25236bded7e9f195237c3eabd3f3ee2ecf0371eae4843063a407e31536d1c962b5b889b5aa7d63c47cef38dd67bab61f1f1accc102857c44b61ced051ce9

data/.rbenv-gemsets

@@ -0,0 +1 @@
+fanforce-factory

data/.rbenv-version

@@ -0,0 +1 @@
+2.0.0-p247

data/Gemfile.lock

@@ -0,0 +1,90 @@
+PATH
+  remote: .
+  specs:
+    fanforce-factory (0.7.0)
+      activesupport
+      bitbucket_rest_api
+      fanforce-api
+      heroku-api (= 0.3.8)
+      iron_worker_ng
+      multi_json
+      redis
+      rest-client
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    activesupport-inflector (0.1.0)
+    atomic (1.1.14)
+    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.17.0)
+      multi_json (>= 1.7.2)
+      oj (~> 2.1.4)
+      rack
+    fanforce-api (0.20.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.0)
+      faraday (>= 0.7.4, < 0.9)
+    hashie (2.0.5)
+    heroku-api (0.3.8)
+      excon (~> 0.16.10)
+    i18n (0.6.9)
+    iron_core (1.0.3)
+      rest (>= 2.6.4)
+    iron_worker_ng (1.2.0)
+      bundler
+      iron_core (>= 1.0.0)
+      rubyzip (>= 1.0.0)
+    mime-types (2.1)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    multi_json (1.8.4)
+    multipart-post (1.2.0)
+    net-http-persistent (2.9.2)
+    netrc (0.7.7)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oj (2.1.7)
+    rack (1.5.2)
+    redis (3.0.7)
+    rest (2.7.1)
+      net-http-persistent (>= 2.9.1)
+      rest_client (>= 1.7.1)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rest_client (1.7.2)
+      netrc (~> 0.7.7)
+    rubyzip (1.1.0)
+    simple_oauth (0.2.0)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fanforce-factory!

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 => [:setup, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config, :cleanorgs],
+      :allowed => [:setup, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config, :cleanorgs, :upgrade],
   )
 else
   factory.start(
-      :runtype => :realtime,
-      :allowed => [:create, :setup, :delete, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config, :cleanorgs],
+      :runtype => :multiple,
+      :allowed => [:create, :setup, :delete, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config, :cleanorgs, :upgrade],
   )
 end

data/lib/fanforce/factory/_base.rb

@@ -222,10 +222,10 @@ class Fanforce::Factory
   #################################################################################
 
   def run(method, *args)
-    (@runtype == :forked) ? run_forked(method, *args) : run_realtime(method, *args)
+    (@runtype == :forked) ? run_forked(method, *args) : run_multiple(method, *args)
   end
 
-  def run_realtime(method, *args)
+  def run_multiple(method, *args)
     if (dirs = Addons.dirs).size == 0
       puts "\n---------------------------------------------------------------------------------------------------------------"
       puts "#{'Oops'.format(:bold)}... no factory addons #{$Filter.length > 0 ? 'matching your filter was' : 'were'} found in this directory."

data/lib/fanforce/factory/commands.rb

@@ -293,7 +293,7 @@ class Fanforce::Factory
 
       if [:all,:bitbucket].include?(command) and $Config[:bitbucket].present?
         puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Bitbucket (#{$Config[:bitbucket][:user]})..."
-        Run.command("git push #{$Config[:bitbucket][:user]} --all")
+        Run.command("git push bitbucket --all")
       end
 
       if [:all,:heroku].include?(command) and environment != :development
@@ -569,24 +569,35 @@ class Fanforce::Factory
     puts "\n---------------------------------------------------------------------------------------------------------------"
     puts "#{addon.type.to_s.upcase.format(:bold)} - #{addon._id.upcase.gsub('-',' ').format(:bold)} (#{processed_count} of #{total_count})... "
 
-    heroku = auth_heroku(:staging)
-    heroku_app_name = get_heroku_app_qa_name(addon, environment)
-    begin
-      heroku.delete_app(heroku_app_name)
-      puts "#{'Deleted   '.format(:green,:bold)}" + "#{environment} app on heroku (#{heroku_app_name})"
-    rescue
-      heroku.post_app(name: heroku_app_name)
-      puts "#{'Not Found '.format(:green,:bold)}" + "#{environment} on heroku (#{heroku_app_name})"
+    #heroku = auth_heroku(:staging)
+    #heroku_app_name = get_heroku_app_qa_name(addon, environment)
+    #begin
+    #  heroku.delete_app(heroku_app_name)
+    #  puts "#{'Deleted   '.format(:green,:bold)}" + "#{environment} app on heroku (#{heroku_app_name})"
+    #rescue
+    #  heroku.post_app(name: heroku_app_name)
+    #  puts "#{'Not Found '.format(:green,:bold)}" + "#{environment} on heroku (#{heroku_app_name})"
+    #end
+
+    if (`git remote`).split(/\r?\n/).include?($Config[:bitbucket][:user])
+      puts "#{'Removed '.format(:red,:bold)}" + "git remote for #{$Config[:bitbucket][:user]}"
+      `git remote rm #{$Config[:bitbucket][:user]}`
     end
-
-    remote_name = "#{environment==:production ? 'prd' : 'qa'}-heroku"
-    if (`git remote`).split(/\r?\n/).include?(remote_name)
-      puts "#{'Removed '.format(:green,:bold)}" + "git remote for #{remote_name}"
-      `git remote rm #{remote_name}`
+    if (`git remote`).split(/\r?\n/).include?('qa-heroku')
+      puts "#{'Removed '.format(:red,:bold)}" + "git remote for qa-heroku"
+      `git remote rm qa-heroku`
+    end
+    if (`git remote`).split(/\r?\n/).include?('bitbucket')
+      puts "#{'Updated '.format(:green,:bold)}" + "git remote for bitbucket"
+      `git remote rm bitbucket`
+      `git remote add bitbucket git@bitbucket.org:#{$Config[:bitbucket][:user]}/#{addon.dir_name}.git`
     else
-      puts "#{'Not Found '.format(:green,:bold)}" + "git remote for #{remote_name}"
+      `git remote add bitbucket git@bitbucket.org:#{$Config[:bitbucket][:user]}/#{addon.dir_name}.git`
+      puts "#{'Created '.format(:green,:bold)}" + "git remote for bitbucket"
     end
 
+    `git config --remove-section branch.master`
+    `git push --set-upstream bitbucket master`
 
   end
 

data/lib/fanforce/factory/commands_support.rb

@@ -84,13 +84,17 @@ class Fanforce::Factory
     if (`git remote`).split(/\r?\n/).include?($Config[:bitbucket][:user])
       puts "#{'Updated '.format(:green,:bold)}" + "git remote for #{$Config[:bitbucket][:user]}"
       `git remote rm #{$Config[:bitbucket][:user]}`
+    elsif (`git remote`).split(/\r?\n/).include?('bitbucket')
+      `git remote rm bitbucket`
+      puts "#{'Removed '.format(:red,:bold)}" + "git remote for #{$Config[:bitbucket][:user]}"
+      puts "#{'Created '.format(:green,:bold)}" + "git remote for bitbucket"
     else
-      puts "#{'Created '.format(:green,:bold)}" + "git remote for #{$Config[:bitbucket][:user]}"
+      puts "#{'Created '.format(:green,:bold)}" + "git remote for bitbucket"
     end
-    `git remote add #{$Config[:bitbucket][:user]} https://#{$Config[:bitbucket][:user]}@bitbucket.org/#{$Config[:bitbucket][:user]}/#{addon.dir_name}.git`
+    `git remote add bitbucket git@bitbucket.org:#{$Config[:bitbucket][:user]}/#{addon.dir_name}.git`
 
     puts "#{'Pushing '.format(:green,:bold)}" + "latest commit to #{$Config[:bitbucket][:user]}..."
-    Run.command("git push #{$Config[:bitbucket][:user]} --all")
+    Run.command("git push bitbucket --all")
   end
 
   def auth_heroku(environment)

data/lib/fanforce/factory/help.rb

@@ -8,8 +8,8 @@ module Fanforce::Factory::Help
 
   def commands(allowed_commands)
     response  = "\n\nAVAILABLE COMMANDS...\n-----------------------------------------------------------------------------------------------------------------------\n"
-    commands  = allowed_commands.map do |c|
-      self.send(:"#{c}_command")
+    commands  = allowed_commands.inject([]) do |results, c|
+      results << self.send(:"#{c}_command") rescue next results
     end
     response += commands.join("-----------------------------------------------------------------------------------------------------------------------\n")
     response += "-----------------------------------------------------------------------------------------------------------------------\n\n"

data/lib/fanforce/factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Factory
-    VERSION = '0.6.2'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-factory
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-07-20 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
     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
@@ -84,42 +84,42 @@ dependencies:
   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-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 addons
@@ -132,7 +132,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-gemsets
+- .rbenv-version
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -161,12 +164,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []