fanforce-app-factory 2.0.0.rc19 → 2.0.0.rc20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2beed20d90586f791c24b947af4c4ce6a5d7b57f
-  data.tar.gz: fb0a346fe303278e934d93270d9388b9877eb8d7
+  metadata.gz: 17ece4c5cc5a95c54cdff33adbdcefebee46719a
+  data.tar.gz: 288e641f3a7e4c34d61907a18d24f05586c2a4ab
 SHA512:
-  metadata.gz: 8e89a8661c9e292dfc757f4178dd4ff3823700b70a7331430b49e02e8ddee77648113de63c7dd90a904e65b109aa4a5a529366b87d5c936b444b9b1e715efa27
-  data.tar.gz: 797b1fb3a86e95bc7cd5279033b58a5db23b2107ddd80a2d50eec9331dec2f63fa4191e5ce378f6173a70ed9c4b48c7336fe96069a7f71824aa1a246dd158053
+  metadata.gz: 24dc4476764b83874f53756b9bd22a9fc67a27c10dd5a5cf049c643db6def68fa20424d8b27cb7cd0922f8554bd44da5ee33cebe270742dbd3816372d72ea92f
+  data.tar.gz: c41a43a975a592b0aafb330d65916451652caa13b0db3ddc5281a2df3dd1cd58f6dca214ded1f593e1e12ecf20636bd84b05f268519ab1da85fd8396691a64ab

data/lib/fanforce/app_factory/cli/lib/bitbucket.rb

@@ -1,5 +1,6 @@
 require 'bitbucket_rest_api'
 require 'rest_client'
+require 'open3'
 
 class Fanforce::AppFactory::CLI::Bitbucket
   include Fanforce::AppFactory::CLI::Utils
@@ -45,22 +46,24 @@ class Fanforce::AppFactory::CLI::Bitbucket
   end
 
   def setup_git_remote(repo_name)
-    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 bitbucket'
-    end
+    Dir.chdir(app.dir) do
+      if console_command('git remote').split(/\r?\n/).include?('bitbucket')
+        log "#{'Found '.format(:green,:bold)}" + 'git remote for bitbucket'
+      else
+        console_command("git remote add bitbucket git@bitbucket.org:#{config[:bitbucket][:user]}/#{repo_name}.git")
+        console_command('git fetch bitbucket')
+        log "#{'Created '.format(:green,:bold)}" + 'git remote for bitbucket'
+      end
 
-    `git remote add bitbucket git@bitbucket.org:#{config[:bitbucket][:user]}/#{repo_name}.git`
-    `git branch -u bitbucket/master` if `git rev-parse --abbrev-ref master@{upstream}`.include?('fatal')
+      upstream_error = Open3.popen3('git rev-parse --abbrev-ref master@{upstream}')[2].gets.to_s
+      if upstream_error.include?('fatal')
+        console_command('git branch -u bitbucket/master')
+        log "#{'Connected '.format(:green,:bold)}" + 'upstream to bitbucket/master'
+      end
 
-    puts "#{'Pushing '.format(:green,:bold)}" + "latest commit to #{config[:bitbucket][:user]}..."
-    console_command('git push bitbucket --all')
+      log "#{'Pushing '.format(:green,:bold)}" + "latest commit to #{config[:bitbucket][:user]}..."
+      console_command('git push bitbucket --all', true)
+    end
   end
 
   def create_repo(repo_name)

data/lib/fanforce/app_factory/cli/lib/bundler.rb

@@ -14,7 +14,7 @@ class Fanforce::AppFactory::CLI::Bundler
       puts 'DONE'
     end
 
-    console_command('bundle')
+    console_command('bundle', true)
     puts 'DONE'.format(:green)
   end
 

data/lib/fanforce/app_factory/cli/lib/utils.rb

@@ -9,7 +9,7 @@ module Fanforce::AppFactory::CLI::Utils
 
   @@config = nil
 
-  def console_command(command, print_now=true)
+  def console_command(command, print_now=false)
     output = []
     PTY.spawn(command) do |stdin, stdout, pid|
       stdin.each { |line| output << line; print line if print_now }

data/lib/fanforce/app_factory/cli/scripts/setup.rb

@@ -13,7 +13,7 @@ class Fanforce::AppFactory::CLI::Scripts
   def setup(type=:all)
     app = Fanforce::CLI::App.new(Fanforce::CLI::DIR)
     type = type.to_s.downcase.to_sym
-    error 'Unknown setup type', :setup if ![:all,:bundler,:pow,:git,:env,:uranium].include?(type)
+    error 'Unknown setup type', :setup if ![:all,:bundler,:pow,:git,:bitbucket,:env,:uranium].include?(type)
 
     if !File.exists?("#{app.dir}/config.ru")
       error "This does not seem to be a valid app directory since it's missing config.ru"

data/lib/fanforce/app_factory/cli/scripts/update.rb

@@ -132,17 +132,20 @@ class Fanforce::AppFactory::CLI::Scripts
     end
   end
 
-  def install_factory_gem_locally(version, local_path)
-    return if !local_path
+  def install_factory_gem_locally(version, local_gem_path)
+    return if !local_gem_path
     gem_filepath = nil
-    Dir.chdir(local_path) do
+    Dir.chdir(local_gem_path) do
       system 'git add -A'
       system 'rake build'
-      Dir.glob("#{local_path}/pkg/*.gem").each do |file|
+      Dir.glob("#{local_gem_path}/pkg/*.gem").each do |file|
         break gem_filepath = file if file.include?(version)
       end
     end
-    system "gem install #{gem_filepath}"
+    Dir.chdir(Fanforce::CLI::DIR) do
+      log "INSTALLING #{gem_filepath}..."
+      system "gem install #{gem_filepath}"
+    end
   end
 
 end

data/lib/fanforce/app_factory/cli_single_app.rb

@@ -15,11 +15,12 @@ class Fanforce::AppFactory::CLI::Scripts
 
   Fanforce::CLI.register(self, :setup,
                          ['*all/TYPE', 'Setup bundle, pow, git, and env variables'],
-                         ['bundler',  'Ensure bundler is installed then run bundle'],
-                         ['pow',      'Ensure pow domains are setup correctly'],
-                         ['git',      'Ensure git repository is initialized'],
-                         ['env',      'Create ENV variables from local .env folder'],
-                         ['uranium',  'Register config.json with uranium and add environ']
+                         ['bundler',   'Ensure bundler is installed then run bundle'],
+                         ['pow',       'Ensure pow domains are setup correctly'],
+                         ['git',       'Ensure git repository is initialized'],
+                         ['bitbucket', 'Setup remote repository on bitbucket'],
+                         ['env',       'Create ENV variables from local .env folder'],
+                         ['uranium',   'Register config.json with uranium and add environ']
   ) { require_relative 'cli/scripts/setup' }
 
   ########################################################################################################################

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc19'
+    VERSION = '2.0.0.rc20'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc19
+  version: 2.0.0.rc20
 platform: ruby
 authors:
 - Caleb Clark