bonethug 0.0.78 → 0.0.79

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/Gemfile +29 -25
  2. data/config/deploy.rb +16 -3
  3. data/lib/bonethug/version.rb +2 -2
  4. metadata +4 -4
data/Gemfile CHANGED
@@ -18,32 +18,36 @@ gem 'mina', github: 'nadarei/mina'
18
18
  gem 'astrails-safe', github: 'astrails/safe'
19
19
  gem 'whenever', github: 'javan/whenever'
20
20
 
21
- # guard
22
- if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
23
- gem 'wdm', '>= 0.1.0'
24
- gem 'guard', '>= 1.8.3', '< 2.0'
25
- gem 'listen', '~> 1.3'
26
- else
27
- gem 'guard', '>=2.5.1'
28
- gem 'listen', '>=2.6.2'
29
- end
21
+ group :development do
22
+
23
+ # guard
24
+ if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
25
+ gem 'wdm', '>= 0.1.0'
26
+ gem 'guard', '>= 1.8.3', '< 2.0'
27
+ gem 'listen', '~> 1.3'
28
+ else
29
+ gem 'guard', '>=2.5.1'
30
+ gem 'listen', '>=2.6.2'
31
+ end
32
+
33
+ # asset pipeline - guard sprockets
34
+ gem 'guard-sprockets', github: 'dormi/guard-sprockets'
35
+ gem 'sass-rails'
36
+ gem 'coffee-rails'
37
+
38
+ # asset pipeline - guard not sprockets
39
+ gem 'coffee-script', github: 'josh/ruby-coffee-script'
40
+ gem 'uglifier'
41
+ gem 'sass'
42
+ gem 'guard-sass'
43
+ gem 'guard-coffeescript', '1.3.4'
44
+ gem 'guard-erb'
45
+ gem 'guard-slim'
46
+ gem 'guard-uglify', github: 'customink/guard-uglify'
47
+ gem 'guard-concat', github: 'mikz/guard-concat'
48
+ gem 'guard-livereload'
30
49
 
31
- # asset pipeline - guard sprockets
32
- gem 'guard-sprockets', github: 'dormi/guard-sprockets'
33
- gem 'sass-rails'
34
- gem 'coffee-rails'
35
-
36
- # asset pipeline - guard not sprockets
37
- gem 'coffee-script', github: 'josh/ruby-coffee-script'
38
- gem 'uglifier'
39
- gem 'sass'
40
- gem 'guard-sass'
41
- gem 'guard-coffeescript', '1.3.4'
42
- gem 'guard-erb'
43
- gem 'guard-slim'
44
- gem 'guard-uglify', github: 'customink/guard-uglify'
45
- gem 'guard-concat', github: 'mikz/guard-concat'
46
- gem 'guard-livereload'
50
+ end
47
51
 
48
52
  # if RUBY_PLATFORM.downcase.include?('linux')
49
53
  # gem 'therubyracer'
data/config/deploy.rb CHANGED
@@ -15,7 +15,7 @@
15
15
  require 'rubygems'
16
16
  require 'bonethug/conf'
17
17
  require 'bonethug/installer'
18
- require 'mina/bundler'
18
+ # require 'mina/bundler' # does stupid stuff with symlinks
19
19
  require 'mina/rails'
20
20
  require 'mina/git'
21
21
  require 'mina/rbenv'
@@ -81,7 +81,13 @@ set :user, deploy.get('user')
81
81
  set :port, deploy.get('port')
82
82
  set :rails_env, env
83
83
  set :shared_paths, shared
84
- set :bundle_path, './vendor/thug_bundle' # need to set this or we end up with symlink loop
84
+
85
+ # Mina bundler fixes
86
+ # ---------------------------------------------------------------
87
+
88
+ set :bundle_bin, 'bundle'
89
+ set :bundle_path, './vendor/thug_bundle'
90
+ set :bundle_options, lambda { %{--without development:test --path "#{bundle_path}" --binstubs bin/ --deployment} }
85
91
 
86
92
  # Tasks
87
93
  # ---------------------------------------------------------------
@@ -245,7 +251,14 @@ task :deploy => :environment do
245
251
  # common deployment tasks
246
252
  invoke :'git:clone'
247
253
  invoke :'deploy:link_shared_paths'
248
- invoke :'bundle:install'
254
+
255
+ # invoke :'bundle:install'
256
+ # we are omitting the symlink step because vendor should already be symlinked
257
+ queue %{
258
+ echo "-----> Installing gem dependencies using Bundler"
259
+ #{echo_cmd %[mkdir -p "#{File.dirname bundle_path}"]}
260
+ #{echo_cmd %[#{bundle_bin} install #{bundle_options}]}
261
+ }
249
262
 
250
263
  # rails deploy tasks
251
264
  if deploy.get('project_type') =~ /rails[0-9]?/
@@ -1,6 +1,6 @@
1
1
 
2
2
  module Bonethug
3
- VERSION = "0.0.78"
4
- BUILD_DATE = "2014-04-11 11:55:23 +1200"
3
+ VERSION = "0.0.79"
4
+ BUILD_DATE = "2014-04-15 10:52:28 +1200"
5
5
  end
6
6
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bonethug
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.78
4
+ version: 0.0.79
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-04-10 00:00:00.000000000 Z
12
+ date: 2014-04-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -557,7 +557,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
557
557
  version: '0'
558
558
  segments:
559
559
  - 0
560
- hash: 4336628524101868890
560
+ hash: -257142101790703829
561
561
  required_rubygems_version: !ruby/object:Gem::Requirement
562
562
  none: false
563
563
  requirements:
@@ -566,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
566
566
  version: '0'
567
567
  segments:
568
568
  - 0
569
- hash: 4336628524101868890
569
+ hash: -257142101790703829
570
570
  requirements: []
571
571
  rubyforge_project:
572
572
  rubygems_version: 1.8.23