obbistrano 1.1.107 → 1.1.108
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/obbistrano_tasks.rb +7 -7
- data/obbistrano.gemspec +1 -1
- metadata +2 -2
data/lib/obbistrano_tasks.rb
CHANGED
@@ -109,14 +109,14 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
109
109
|
|
110
110
|
task :git_deploy, :roles =>[:web] do
|
111
111
|
pretty_print "Application being updated on branch #{branch}"
|
112
|
-
|
112
|
+
|
113
113
|
set :local_branch, $1 if `git branch` =~ /\* (\S+)\s/m
|
114
114
|
if !local_branch.eql? branch
|
115
115
|
logger.info "You are on branch #{local_branch}, not #{branch}, please check out there before deploying to be able to combine the correct js and css files."
|
116
116
|
puts_fail
|
117
117
|
exit
|
118
118
|
end
|
119
|
-
|
119
|
+
puts_ok
|
120
120
|
if defined? "#{commit}"
|
121
121
|
pretty_print "--> Deploying application from #{repository} on commit #{commit}"
|
122
122
|
else
|
@@ -500,7 +500,8 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
500
500
|
if defined? "#{newdeploy}" then
|
501
501
|
if defined? "#{plugins}"
|
502
502
|
plugins.each do |plugin|
|
503
|
-
pretty_print "-->
|
503
|
+
pretty_print "--> Adding Plugin: #{plugin}"
|
504
|
+
puts_ok
|
504
505
|
paths << "#{build_to}/plugins/#{plugin}/resources/public/stylesheets"
|
505
506
|
end
|
506
507
|
end
|
@@ -510,7 +511,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
510
511
|
Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
|
511
512
|
paths.each do |bundle_directory|
|
512
513
|
bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/stylesheets", "").gsub("public/stylesheets/", "")
|
513
|
-
pretty_print "-->
|
514
|
+
pretty_print "--> Adding Bundle: #{bundle_name}"
|
514
515
|
puts_ok
|
515
516
|
next if bundle_name.empty?
|
516
517
|
files = recursive_file_list(bundle_directory, ".css")
|
@@ -521,7 +522,6 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
521
522
|
end
|
522
523
|
target = "#{build_to}/public/stylesheets/build/#{bundle_name}_combined.css"
|
523
524
|
File.open(target, 'w') { |f| f.write(bundle) }
|
524
|
-
puts_ok
|
525
525
|
end
|
526
526
|
else
|
527
527
|
paths = paths | get_top_level_directories("#{build_to}/plugins/cms/resources/public/stylesheets") if defined? "#{cms}"
|
@@ -551,7 +551,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
551
551
|
if defined? "#{newdeploy}" then
|
552
552
|
if defined? "#{plugins}"
|
553
553
|
plugins.each do |plugin|
|
554
|
-
pretty_print "--> plugin: #{plugin}"
|
554
|
+
pretty_print "--> Adding plugin: #{plugin}"
|
555
555
|
puts_ok
|
556
556
|
paths << "#{build_to}/plugins/#{plugin}/resources/public/javascripts"
|
557
557
|
end
|
@@ -560,7 +560,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
560
560
|
Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
|
561
561
|
paths.each do |bundle_directory|
|
562
562
|
bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/javascripts", "").gsub("public/javascripts/", "")
|
563
|
-
pretty_print "-->
|
563
|
+
pretty_print "--> Adding Bundle: #{bundle_name}"
|
564
564
|
puts_ok
|
565
565
|
next if bundle_name.empty?
|
566
566
|
files = recursive_file_list(bundle_directory, ".js")
|
data/obbistrano.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{obbistrano}
|
5
|
-
s.version = "1.1.
|
5
|
+
s.version = "1.1.108"
|
6
6
|
s.authors = ["Ross Riley", "One Black Bear"]
|
7
7
|
s.date = Time.now
|
8
8
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|