bonethug 0.0.78 → 0.0.79

data/Gemfile

@@ -18,32 +18,36 @@ gem 'mina',             github: 'nadarei/mina'
 gem 'astrails-safe',    github: 'astrails/safe'
 gem 'whenever',         github: 'javan/whenever'
 
-# guard
-if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
-  gem 'wdm', '>= 0.1.0'
-  gem 'guard', '>= 1.8.3', '< 2.0'
-  gem 'listen', '~> 1.3'
-else
-  gem 'guard', '>=2.5.1'
-  gem 'listen', '>=2.6.2'
-end
+group :development do
+
+	# guard
+	if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
+	  gem 'wdm', '>= 0.1.0'
+	  gem 'guard', '>= 1.8.3', '< 2.0'
+	  gem 'listen', '~> 1.3'
+	else
+	  gem 'guard', '>=2.5.1'
+	  gem 'listen', '>=2.6.2'
+	end
+
+	# asset pipeline - guard sprockets
+	gem 'guard-sprockets', github: 'dormi/guard-sprockets'
+	gem 'sass-rails'
+	gem 'coffee-rails'
+
+	# asset pipeline - guard not sprockets
+	gem 'coffee-script', github: 'josh/ruby-coffee-script'
+	gem 'uglifier'
+	gem 'sass'
+	gem 'guard-sass'
+	gem 'guard-coffeescript', '1.3.4'
+	gem 'guard-erb'
+	gem 'guard-slim'
+	gem 'guard-uglify', github: 'customink/guard-uglify'
+	gem 'guard-concat', github: 'mikz/guard-concat'
+	gem 'guard-livereload'
 
-# asset pipeline - guard sprockets
-gem 'guard-sprockets', github: 'dormi/guard-sprockets'
-gem 'sass-rails'
-gem 'coffee-rails'
-
-# asset pipeline - guard not sprockets
-gem 'coffee-script', github: 'josh/ruby-coffee-script'
-gem 'uglifier'
-gem 'sass'
-gem 'guard-sass'
-gem 'guard-coffeescript', '1.3.4'
-gem 'guard-erb'
-gem 'guard-slim'
-gem 'guard-uglify', github: 'customink/guard-uglify'
-gem 'guard-concat', github: 'mikz/guard-concat'
-gem 'guard-livereload'
+end
 
 # if RUBY_PLATFORM.downcase.include?('linux')
 #   gem 'therubyracer'

data/config/deploy.rb

@@ -15,7 +15,7 @@
 require 'rubygems'
 require 'bonethug/conf'
 require 'bonethug/installer'
-require 'mina/bundler'
+# require 'mina/bundler' # does stupid stuff with symlinks
 require 'mina/rails'
 require 'mina/git'
 require 'mina/rbenv'
@@ -81,7 +81,13 @@ set :user,          deploy.get('user')
 set :port,          deploy.get('port')
 set :rails_env,     env
 set :shared_paths,  shared
-set :bundle_path,   './vendor/thug_bundle' # need to set this or we end up with symlink loop
+
+# Mina bundler fixes
+# ---------------------------------------------------------------
+
+set :bundle_bin, 'bundle'
+set :bundle_path, './vendor/thug_bundle'
+set :bundle_options, lambda { %{--without development:test --path "#{bundle_path}" --binstubs bin/ --deployment} }
 
 # Tasks
 # ---------------------------------------------------------------
@@ -245,7 +251,14 @@ task :deploy => :environment do
     # common deployment tasks
     invoke :'git:clone'
     invoke :'deploy:link_shared_paths'
-    invoke :'bundle:install'
+
+    # invoke :'bundle:install'
+    # we are omitting the symlink step because vendor should already be symlinked
+    queue %{
+      echo "-----> Installing gem dependencies using Bundler"
+      #{echo_cmd %[mkdir -p "#{File.dirname bundle_path}"]}
+      #{echo_cmd %[#{bundle_bin} install #{bundle_options}]}
+    }
 
     # rails deploy tasks
     if deploy.get('project_type') =~ /rails[0-9]?/

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.78"
-          BUILD_DATE = "2014-04-11 11:55:23 +1200"
+          VERSION = "0.0.79"
+          BUILD_DATE = "2014-04-15 10:52:28 +1200"
         end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -557,7 +557,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4336628524101868890
+      hash: -257142101790703829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -566,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4336628524101868890
+      hash: -257142101790703829
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23