softwear-lib 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee29f7263adae53ab78fc85bbf5be053ab9e595
-  data.tar.gz: fb4122fcdf16d493d6458ccd6244b0389abed414
+  metadata.gz: 56a733c32d114c4aefd83328ba1264b7695f8822
+  data.tar.gz: 009929f9221bb986b7b8c6d0f06cf8a41f2d9828
 SHA512:
-  metadata.gz: 1d9e0af480f85c41f40b64c63e26d1c6de7bc8a061117673373fe3889e7c606be2e49ab664a3f53296141be71c0a3a2a2bbdb470113a9008546d8f7ce6d4d975
-  data.tar.gz: 1eaf5225a3240a1e6d0b7953ce33ebab100cb836bf9388dcafc899ba84581a4feaf505cc87ca26696052f54fc443d668320fc12870e5a8e1a22c95a4c4149b0e
+  metadata.gz: 7519e0b29822609607a7f631eb993eda4ce0d98991080527b449de569a8d3506d5b8697aeaf1f45d577ebf6fd040c691ead7032160f507b9c04270444be3bd0a
+  data.tar.gz: ac135980397e3b033bb4d2d87d63eee03e5be3cf1014d71acda1e547fc8b910120404ac13a3cff55a455aae4f739532d08ecb0753cfaea50c4e2fde299c6cbd7

data/lib/softwear/lib.rb

@@ -66,98 +66,6 @@ group :test do
   gem 'shoulda-matchers'
 end
 )
-
-    def self.capistrano(context)
-      context.instance_eval do
-        Rake::Task["deploy:compile_assets"].clear
-
-        ruby = fetch(:rvm_ruby_string) || fetch(:rvm_ruby_version)
-
-        namespace :deploy do
-
-          desc 'Assure softwear-lib is up to date before deploying'
-          task :update_softwear_lib do
-            on roles(:app), in: :sequence do
-              execute "~/.rvm/bin/rvm #{ruby} do gem install --no-ri --no-rdoc softwear-lib"
-            end
-          end
-
-          desc 'Signal the running rails app to restart'
-          task :restart do
-            on roles([:web, :app]), in: :sequence, wait: 5 do
-              execute :mkdir, '-p', "#{release_path}/tmp"
-              execute :touch, release_path.join('tmp/restart.txt')
-            end
-          end
-
-          after :publishing, :restart_sidekiq_manager do
-            on roles(:sidekiq) do
-              execute 'sudo restart sidekiq-manager'
-            end
-          end
-
-          # This is more problematic than helpful
-=begin
-          if !$LOAD_PATH.grep(/sunspot_solr/).empty? || fetch(:no_reindex)
-            before :publishing, :reindex_solr do
-              on roles(:db) do
-                with rails_env: fetch(:rails_env) || fetch(:stage) do
-                  within(release_path) do
-                    execute :rake, 'sunspot:solr:reindex'
-                  end
-                end
-              end
-            end
-          end
-=end
-
-          # This is no longer necessary
-          # before :updating, :update_softwear_lib
-          after :publishing, :restart
-
-          desc 'Compile assets'
-          task :compile_assets => [:set_rails_env] do
-            invoke 'deploy:assets:precompile_local'
-            invoke 'deploy:assets:backup_manifest'
-          end
-
-          namespace :assets do
-
-            desc "Precompile assets locally and then rsync to web servers"
-            task :precompile_local do
-              # compile assets locally
-              run_locally do
-                execute "RAILS_ENV=#{fetch(:stage)} bundle exec rake assets:precompile"
-              end
-
-              # rsync to each server
-              assets_dir = "public/#{fetch(:assets_prefix) || 'assets'}"
-              local_dir  = "./#{assets_dir}/"
-              on roles( fetch(:assets_roles, [:web]) ) do
-                # this needs to be done outside run_locally in order for host to exist
-                remote_dir = "#{host.user}@#{host.hostname}:#{release_path}/#{assets_dir}"
-
-                execute "mkdir -p #{release_path}/#{assets_dir}"
-                run_locally { execute "rsync -av --delete #{local_dir} #{remote_dir}" }
-
-                if fetch(:asset_sync)
-                  with rails_env: fetch(:rails_env) || fetch(:stage) do
-                    within(release_path) do
-                      with_rvm(fetch(:task_ruby_version)) { execute :rake, 'assets:sync' }
-                    end
-                  end
-                end
-              end
-
-              # clean up
-              run_locally { execute "rm -rf #{local_dir}" }
-            end
-          end
-
-        end
-      end
-    end
-
     def self.fix_sort_argument_error_on_rubinius
       # Rubinius calls Enumerator#sort! within Enumerator#sort_by,
       # # and Mail::PartsList calls sort_by within sort!... See the

data/lib/softwear/lib/capistrano.rb

@@ -0,0 +1,94 @@
+module Softwear
+  module Lib
+    def self.capistrano(context)
+      context.instance_eval do
+        Rake::Task["deploy:compile_assets"].clear
+
+        ruby = fetch(:rvm_ruby_string) || fetch(:rvm_ruby_version)
+
+        namespace :deploy do
+
+          desc 'Assure softwear-lib is up to date before deploying'
+          task :update_softwear_lib do
+            on roles(:app), in: :sequence do
+              execute "~/.rvm/bin/rvm #{ruby} do gem install --no-ri --no-rdoc softwear-lib"
+            end
+          end
+
+          desc 'Signal the running rails app to restart'
+          task :restart do
+            on roles([:web, :app]), in: :sequence, wait: 5 do
+              execute :mkdir, '-p', "#{release_path}/tmp"
+              execute :touch, release_path.join('tmp/restart.txt')
+            end
+          end
+
+          after :publishing, :restart_sidekiq_manager do
+            on roles(:sidekiq) do
+              execute 'sudo restart sidekiq-manager'
+            end
+          end
+
+          # This is more problematic than helpful
+=begin
+          if !$LOAD_PATH.grep(/sunspot_solr/).empty? || fetch(:no_reindex)
+            before :publishing, :reindex_solr do
+              on roles(:db) do
+                with rails_env: fetch(:rails_env) || fetch(:stage) do
+                  within(release_path) do
+                    execute :rake, 'sunspot:solr:reindex'
+                  end
+                end
+              end
+            end
+          end
+=end
+
+          # This is no longer necessary
+          # before :updating, :update_softwear_lib
+          after :publishing, :restart
+
+          desc 'Compile assets'
+          task :compile_assets => [:set_rails_env] do
+            invoke 'deploy:assets:precompile_local'
+            invoke 'deploy:assets:backup_manifest'
+          end
+
+          namespace :assets do
+
+            desc "Precompile assets locally and then rsync to web servers"
+            task :precompile_local do
+              # compile assets locally
+              run_locally do
+                execute "RAILS_ENV=#{fetch(:stage)} bundle exec rake assets:precompile"
+              end
+
+              # rsync to each server
+              assets_dir = "public/#{fetch(:assets_prefix) || 'assets'}"
+              local_dir  = "./#{assets_dir}/"
+              on roles( fetch(:assets_roles, [:web]) ) do
+                # this needs to be done outside run_locally in order for host to exist
+                remote_dir = "#{host.user}@#{host.hostname}:#{release_path}/#{assets_dir}"
+
+                execute "mkdir -p #{release_path}/#{assets_dir}"
+                run_locally { execute "rsync -av --delete #{local_dir} #{remote_dir}" }
+
+                if fetch(:asset_sync)
+                  with rails_env: fetch(:rails_env) || fetch(:stage) do
+                    within(release_path) do
+                      with_rvm(fetch(:task_ruby_version)) { execute :rake, 'assets:sync' }
+                    end
+                  end
+                end
+              end
+
+              # clean up
+              run_locally { execute "rm -rf #{local_dir}" }
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Nigel Baillie
@@ -91,6 +91,7 @@ files:
 - lib/softwear/lib.rb
 - lib/softwear/lib/api_controller.rb
 - lib/softwear/lib/authentication.rb
+- lib/softwear/lib/capistrano.rb
 - lib/softwear/lib/controller_authentication.rb
 - lib/softwear/lib/spec.rb
 - lib/softwear/lib/version.rb