osp-deploy 1.0.3 → 1.1.0

data/lib/osp_deploy/rails_deployer.rb

@@ -8,8 +8,9 @@ class OspDeploy::RailsDeployer
   DEPLOY_CONFIG_FILE = "config/osp-deploy.yml"
 
   REQUIRED_OPTIONS = { :always => [:jobs, :server_uris, :tag_prefix],
-                       :torquebox => [:appl_name, :torquebox_home, :remote_dest_file_dir],
+                       :puma => [:remote_dest_file_dir],
                        :file => [:remote_dest_file_dir],
+                       :torquebox => [:appl_name, :torquebox_home, :remote_dest_file_dir],
                        :precompile_assets => [:environment],
   }
 
@@ -125,6 +126,7 @@ EOT
         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
@@ -145,6 +147,7 @@ EOT
         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
     end
@@ -300,6 +303,39 @@ EOS
   end
 
 
+  def puma_deploy server_uri
+    file_dir = @deployment_config['remote_dest_file_dir']
+    puma_options = @deployment_config['puma_options'] || {}
+    puma_config_filepath = File.join 'config', 'puma.rb'
+    if File.exist? puma_config_filepath
+      puma_config = File.readlines puma_config_filepath
+    else
+      puma_config = []
+    end
+    # always set rails environment
+    puma_options[:environment] = @deployment_config['environment']
+    puma_options.each do |name, value|
+      ix = puma_config.index{|l| l =~ /^#{name}\s+/}
+      cfg_line = "#{name} '#{value}'"
+      if ix
+        puma_config[ix] = cfg_line
+      else
+        puma_config << cfg_line
+      end
+    end
+    conf_file = Tempfile.new(['osp-deploy-puma', '.rb'])
+    conf_content = puma_config.join("\n")
+    conf_file.write conf_content
+    conf_file.close
+    deployment_file = "#{file_dir}/config/puma.rb"
+    logger.info "Create puma config file: #{deployment_file}"
+    logger.debug "Content of puma.rb:\n#{'='*20}\n#{conf_content}\n#{'='*20}"
+    execute_cmd "scp #{conf_file.path} #{server_uri}:#{deployment_file}"
+    conf_file.delete
+    logger.info "Restart puma"
+    execute_cmd "ssh #{server_uri} \"cd #{file_dir} && bin/puma-app.sh restart\" "
+  end
+
 
 
   # read current branch

data/lib/osp_deploy/version.rb

@@ -1,3 +1,3 @@
 module OspDeploy
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

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