capun 0.0.21 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc0ce1f777dea389e1103e4e681f6a375112330a
-  data.tar.gz: 538ae522fab16aa074c65f3a47a1ec92c15d4c6d
+  metadata.gz: 3c6b065c5ffd8c41238ded0c7a8ef01a9d42aa26
+  data.tar.gz: 9c894551307e0ff135d6f50a45620c5d75f1be59
 SHA512:
-  metadata.gz: 9c3d5ba0609a97927b2d2bf16c7b1367c00d93abeba673d73490fbea9efd2fc29eafc1efaa9a7a7da53493722c6cf6ea61fa8868ea5baad7b3865d57294e4b7b
-  data.tar.gz: 702ce0ed6523421fb0d828a7246c599734fb15b1f41f9b1cc9eafca90417703cb6f43bbeb6e60c9db1ccba7e415b0f164a508f01f05ceb2b961bb297f4f302df
+  metadata.gz: 576ce8084fe50492582b72a38f7bea98ef39fa02b2c2a4c07b6de2ae3966fdaa32743105f466927f6d9466c0b6a34bf6e3180ce1075b830ee16ae21944b8612a
+  data.tar.gz: 6099f03a9449c0b3236e67941ef2e02047ba33b5bf0de40d8e8151d0c374fe7a08782ba1822545cdbd602e46ea8163a8a5855ba3d618afceccd68a0a95c1d048

data/lib/capun/setup.rb

@@ -108,6 +108,17 @@ namespace :deploy do
     end
   end
 
+  desc "Checking if Jenkins configuration file"
+  task :check_jenkins_project_existence do
+    on roles(:app) do
+      if fetch(:addJenkins) && test("[ -f /var/lib/jenkins/jobs/#{fetch(:application)}/config.xml ]")
+        set :jenkins_project_exists, true
+      else
+        set :jenkins_project_exists, false
+      end
+    end
+  end
+
   desc 'Setting up Jenkins'
   task :set_up_jenkins do
     if fetch(:addJenkins)
@@ -117,7 +128,7 @@ namespace :deploy do
           execute :sudo, :chmod, "755", "/var/lib/jenkins/jobs/#{fetch(:application)}"
           execute :sudo, :chown, "jenkins:jenkins", "/var/lib/jenkins/jobs/#{fetch(:application)}/config.xml"
           execute :sudo, :chmod, "644", "/var/lib/jenkins/jobs/#{fetch(:application)}/config.xml"
-          execute :sudo, "service jenkins restart"
+          execute :sudo, "service jenkins restart" unless fetch(:jenkins_project_exists)
         end
       end
     end
@@ -152,6 +163,7 @@ namespace :deploy do
 end
 
 before "deploy:updating", "deploy:make_dirs"
+before "deploy:updating", "deploy:check_jenkins_project_existence"
 after "deploy:symlink:linked_dirs", "deploy:upload"
 after "deploy:symlink:linked_dirs", "deploy:add_symlinks"
 after "deploy:publishing", "deploy:set_up_jenkins"

data/lib/capun/version.rb

@@ -1,3 +1,3 @@
 module Capun
-  VERSION = "0.0.21"
+  VERSION = "0.0.23"
 end

data/lib/generators/capun/stage_generator.rb

@@ -16,6 +16,9 @@ module Capun
           @password = ask("Basic authentication password [ex.: secret]:")
         end
         @addJenkins = ask("Would you like to add Jenkins configuration file? [Y/n]").capitalize == 'Y'
+        if @addJenkins
+            @jenkinsToken = ask("New Jenkins token key:")
+        end
         @addNewRelic = ask("Would you like to add New Relic configuration file? [Y/n]").capitalize == 'Y'
         if @addNewRelic
           @newRelicKey = ask("New relic key:")
@@ -88,7 +91,7 @@ module Capun
       def add_jenkins
         if @addJenkins
           copy_file "jenkins.config.xml.erb", "config/deploy/jenkins.config.xml.erb"
-          append_to_file "config/deploy/#{singular_name}.rb", "\nset :addJenkins, true"
+          append_to_file "config/deploy/#{singular_name}.rb", "\nset :addJenkins, true\nset :jenkinsToken, \"#{@jenkinsToken}\""
         end
       end
 

data/lib/generators/capun/templates/jenkins.config.xml.erb

@@ -45,7 +45,7 @@
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <authToken><%= Digest::MD5.hexdigest(fetch(:application) + Time.now.to_f.to_s) %></authToken>
+  <authToken><%= fetch(:jenkinsToken) %></authToken>
   <triggers/>
   <concurrentBuild>false</concurrentBuild>
   <builders>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capun
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.23
 platform: ruby
 authors:
 - Ivan Zamylin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Opinionated Rails deployment solution with CAPistrano, Unicorn and Nginx.