fanforce-app-factory 2.0.0.rc16 → 2.0.0.rc17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f302533c95e1bb8d080700dc3cdf11b597d5363e
-  data.tar.gz: 7f72332d104b47c97ddab93edee08d4afeed1753
+  metadata.gz: c9f8669748e3705968a85c6e23b827eb3a682a84
+  data.tar.gz: 181106208de0cf2e82651e751ef742c42d47bffc
 SHA512:
-  metadata.gz: 40e907e6b1627c01f94fee1f8291ded904b18cce6d8ff4714188b6c80d6b563ef020cc099c0b5d782deb53e68b1116d7252ea9dc9538c61bfe364f1219e71a06
-  data.tar.gz: 25914d2c9e1b99e11ad6771d4e813d04281cf3b13e86a03424c2e0287e0a4224c03f200be5d1ed0d0650cf426f20e87334fcc807c35147e387dad457ad2529ca
+  metadata.gz: 432472d0836d18ead8089be68a93886d41034678c2a40833396d540495f9d27f03b20c11f0d702a85f0cf0d8183f6c15727573ea90ecde2037c8b8f074bc519e
+  data.tar.gz: 094f41dee08edc6989235b6fa194b255c4265ae35b87c3c5244fdd643fc0e8f5430bc4cc0d703900a61107ce7d01bf1c7c442a84ee278876f81de2f97132b044

data/lib/fanforce/app_factory/app.rb

@@ -58,4 +58,3 @@ class Fanforce::App
     Sinatra.new.call(env)
   end
 end
-

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

@@ -55,7 +55,9 @@ class Fanforce::AppFactory::CLI::Bitbucket
     else
       puts "#{'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')
 
     puts "#{'Pushing '.format(:green,:bold)}" + "latest commit to #{config[:bitbucket][:user]}..."
     console_command('git push bitbucket --all')

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

@@ -12,10 +12,10 @@ class Fanforce::AppFactory::CLI::Scaffolding
 
   def setup
     if File.directory?("#{app.dir}/tmp")
-      log "#{'Found  '.format(:green,:bold)} #{app.dir}/tmp/"
+      log "#{'Found  '.format(:green,:bold)} #{app._id}/tmp/"
     else
       Dir.mkdir("#{app.dir}/tmp")
-      log "#{'Created'.format(:green,:bold)} #{app.dir}/tmp/"
+      log "#{'Created'.format(:green,:bold)} #{app._id}/tmp/"
     end
     files.each {|file| file.create }
   end

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

@@ -504,7 +504,7 @@ class Fanforce::AppFactory::CLI::ScaffoldingFile
   end
 
   def extract_relativepath(filepath)
-    filepath.gsub(Fanforce::CLI::DIR, '')
+    filepath.gsub("#{Fanforce::CLI::DIR}/", '')
   end
 
 end

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

@@ -16,7 +16,7 @@ class Fanforce::AppFactory::CLI::Uranium
       if response.code == 404
         setup(false)
       elsif response.code < 300
-        confirm "\nThis app (#{app_id}) already exists in uranium. Proceeding will overwrite it.\n"+
+        confirm "\nThis app (#{app._id}) already exists in uranium. Proceeding will overwrite it.\n"+
                 'OVERWRITE EXISTING URANIUM VERSION?', true
         setup(true)
       else

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

@@ -23,7 +23,7 @@ class Fanforce::AppFactory::CLI::Scripts
     log 'CREATING FILES...'
     Dir.mkdir(app_dir) if !File.directory?(app_dir)
     Dir.chdir(app_dir)
-    log "#{'Created'.format(:bold, :green)} #{app_dir}/"
+    log "#{'Created'.format(:bold, :green)} #{app_id}/"
     app = Fanforce::CLI::App.new(app_dir)
     Fanforce::AppFactory::CLI::Scaffolding.new(app).setup
 

data/lib/fanforce/app_factory/scaffolding/layouts/._engagement.haml.registry

@@ -1 +1,2 @@
 fanforce-app-factory-2.0.0.rc6:02405b7a50a0ed450d10c57b6d6ad034a247e9d1
+fanforce-app-factory-2.0.0.rc16:b4b9aa096770b68ec2c9da62349443747d5afa88

data/lib/fanforce/app_factory/scaffolding/layouts/engagement.haml

@@ -24,7 +24,7 @@
 
   = yield_content :after_fanforce_js
   :coffeescript
-    FF.on('logout', ->
+    FF.on('visitor.logout', ->
       $('#hello').html('')
     )
     FF.organization (organization)->
@@ -36,4 +36,4 @@
         $('#logo').html('<div class="logo"><img src="' + organization.logo_url + '"></div>') if organization.logo_url
     FF.visitor (visitor)->
       return if !visitor.access_level
-      $('#hello').html('<div class="hello"><div class="hello-wrapper"><span class="greeting">Hello, ' + visitor.first_name + '!</span><a href="javascript: FF.logout(); void(0)">Logout</a></div></div>')
+      $('#hello').html('<div class="hello"><div class="hello-wrapper"><span class="greeting">Hello, ' + visitor.first_name + '!</span><a href="javascript: FF.visitor.logout(); void(0)">Logout</a></div></div>')

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc16'
+    VERSION = '2.0.0.rc17'
   end
 end

metadata

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