osp-deploy 1.1.1 → 1.2.0

data/bin/osp-rails-deploy.rb

@@ -68,7 +68,7 @@ case command
   when 'make-last-changes'
     deployer.make_last_changelog
   when 'deploy'
-    deployer.deploy_and_bundle
+    deployer.deploy
   else
     print_usage 2, "Unknown command: #{command}"
 end

data/lib/osp_deploy/rails_deployer.rb

@@ -10,8 +10,8 @@ class OspDeploy::RailsDeployer
   REQUIRED_OPTIONS = { :always => [:jobs, :server_uris, :tag_prefix],
                        :puma => [:remote_dest_file_dir],
                        :file => [:remote_dest_file_dir],
+                       :war => [:remote_dest_file_dir, :war_file_name],
                        :torquebox => [:appl_name, :torquebox_home, :remote_dest_file_dir],
-                       :precompile_assets => [:environment],
   }
 
   DEFAULT_EXCLUDES = ['coverage', 'nbproject', '.idea', 'tmp', 'log', '.git', '*~']
@@ -119,46 +119,42 @@ EOT
 
   # Deploy this project to the remote-servers
   def deploy
+    validate_config
     gen_version_initializer
-    threads = nil
-    if @deployment_config['jobs'].include?(:file) || @deployment_config['jobs'].include?(:torquebox)
-      threads = server_iterator(:threads => true) do |server_uri|
-        precompile_assets if @deployment_config['jobs'].include?(:precompile_assets)
-        sync_files_to_remote_server(server_uri)
-        torquebox_deploy(server_uri) if @deployment_config['jobs'].include?(:torquebox)
-        puma_deploy(server_uri) if @deployment_config['jobs'].include?(:puma)
-        precompile_assets_housekeeping if @deployment_config['jobs'].include?(:precompile_assets)
-      end
-    end
-    threads.each{|t| t.join }
-    server_iterator do |server_uri|
-      execute_post_commands(server_uri)
+
+    do_before_local = @deployment_config['do_before_local']
+    do_cmds 'do_before_local', do_before_local
+
+    if @deployment_config['jobs'].include?(:war)
+      execute_cmd 'warble'
     end
-  end
 
 
-  # Deploy this project and execute bundler
-  def deploy_and_bundle
-    gen_version_initializer
     threads = nil
-    if @deployment_config['jobs'].include?(:file) || @deployment_config['jobs'].include?(:torquebox)
-      threads = server_iterator(:threads => true) do |server_uri|
-        precompile_assets if @deployment_config['jobs'].include?(:precompile_assets)
+    threads = server_iterator(:threads => true) do |server_uri|
+      do_before = @deployment_config['do_before']
+      do_cmds 'do_before_local', do_before, server_uri, false
+
+      if !(['file', 'torquebox', 'puma'] & @deployment_config['jobs']).empty?
         sync_files_to_remote_server(server_uri)
-        bundler_actions_on_remote_server(server_uri)
-        torquebox_deploy(server_uri) if @deployment_config['jobs'].include?(:torquebox)
-        puma_deploy(server_uri) if @deployment_config['jobs'].include?(:puma)
-        precompile_assets_housekeeping if @deployment_config['jobs'].include?(:precompile_assets)
       end
+
+      torquebox_deploy(server_uri) if @deployment_config['jobs'].include?(:torquebox)
+      puma_deploy(server_uri) if @deployment_config['jobs'].include?(:puma)
+      war_deploy(server_uri) if @deployment_config['jobs'].include?(:war)
+
+      do_after = @deployment_config['do_after'] || @deployment_config['post_commands']
+      do_cmds 'do_after', do_after, server_uri, false
     end
     threads.each{|t| t.join }
-    server_iterator do |server_uri|
-      execute_post_commands(server_uri)
-    end
+    do_after_local = @deployment_config['do_after_local']
+    do_cmds 'do_after_local', do_after_local
   end
 
 
 
+
+
   # make git-log for last 20 commits in medium format into file last-changelog.txt
   def make_last_changelog
     logger.info "make_last_changelog"
@@ -213,19 +209,6 @@ EOT
 
 
 
-  def execute_post_commands server_uri
-    post_commands = @deployment_config['post_commands']
-    return if post_commands.nil?
-    raise "Option 'post_commands' expected an Array!" unless post_commands.is_a?(Array)
-    logger.info "Execute post-commands."
-
-    file_dir = @deployment_config['remote_dest_file_dir']
-    post_commands = ["cd #{file_dir}"] + post_commands if file_dir
-
-    cmd = "ssh #{server_uri} \"#{post_commands.join(' && ')}\""
-    execute_cmd(cmd)
-  end
-
 
 
   # Rsync Project-Dir mit Remote-Server inkl. Rename der Config-Files
@@ -262,18 +245,6 @@ EOT
   end
 
 
-  # Aufruf des Bundlers auf dem Zielsystem
-  def bundler_actions_on_remote_server server_uri
-    file_dir = @deployment_config['remote_dest_file_dir']
-    bundler_cmd = @deployment_config['bundler_cmd'] || BUNDLER_DEFAULT_CMD
-    logger.info "Execute '#{bundler_cmd}' on #{server_uri}:#{file_dir}"
-    runtime = Benchmark.realtime do
-      bout = @options[:verbose] ? nil : '> /dev/null'
-      cmd = "ssh #{server_uri} \"cd #{file_dir} && #{bundler_cmd}\"  #{bout}"
-      execute_cmd cmd
-    end
-    logger.info "Execute bundler finished in #{runtime.round}s"
-  end
 
 
 
@@ -337,6 +308,19 @@ EOS
   end
 
 
+  def war_deploy server_uri
+    war_file_src = "#{File.basename(Dir.getwd)}.war"
+    war_file_dest = File.join(@deployment_config['remote_dest_file_dir'], @deployment_config['war_file_name'])
+    if server_uri.start_with?('.') || server_uri.start_with?('/') || server_uri.start_with?('file:')
+      # local uri
+      dest = File.join server_uri, war_file_dest
+    else
+      dest = "#{server_uri}:#{war_file_dest}"
+    end
+    execute_cmd "scp #{war_file_src} #{dest}"
+  end
+
+
 
   # read current branch
   def parse_git_branch
@@ -346,7 +330,7 @@ EOS
   end
 
 
-  # Überprüfen ob es Änderungen im Fiel-System gibt, die noch nicht in GIT eingecheckt wurden
+  # Überprüfen ob es Änderungen im File-System gibt, die noch nicht in GIT eingecheckt wurden
   def git_check
     if @options[:no_git_check]
       logger.warn "Skip GIT check !!! "
@@ -360,27 +344,36 @@ EOS
   end
 
 
-  def precompile_assets
-    logger.info "Precompile assets..."
-    execute_cmd "bundle exec rake assets:precompile RAILS_ENV=#{@deployment_config['environment']}"
-  end
-
-
-  def precompile_assets_housekeeping
-    asset_dir = 'public/assets'
-    if File.exist?(asset_dir)
-      logger.info "Precompile assets housekeeping: remove '#{asset_dir}'"
-      FileUtils.rm_rf asset_dir
-    end
-  end
 
 
   def execute_cmd cmd
-    logger.debug "Execute: #{cmd[/\w+/]}\n\t#{cmd}"
+    logger.debug "Execute: #{cmd}"
     rc = system(cmd)
     raise("Command '#{cmd}' failed.") unless rc
   end
 
 
+  def do_cmds name, cmd_list, server_uri=nil, local=true
+    return if cmd_list.nil? || cmd_list.empty?
+    puts "\nExecute #{name} commands..\n"
+    file_dir = @deployment_config['remote_dest_file_dir']
+    raise "Remote command required server_uri" if !local && server_uri.nil?
+    raise "Remote command required remote_dest_file_dir" if !local && file_dir.nil?
+    cmd_list.each do |cmd|
+      next if cmd.nil?
+      if cmd.start_with? '#'
+        puts cmd
+      else
+        if local
+          sys_cmd = cmd
+        else
+          sys_cmd = "ssh #{server_uri} '. .profile && cd #{file_dir} && export RAILS_ENV=#{@rails_env} && #{cmd}'"
+        end
+        execute_cmd sys_cmd
+      end
+    end
+  end
+ 
+
 
 end

data/lib/osp_deploy/version.rb

@@ -1,3 +1,3 @@
 module OspDeploy
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osp-deploy
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake