daddy 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9720014cfa7dd5f332770849e960b090002987e
-  data.tar.gz: d4f6b781df48ee2156ea315ffb4b2d52ee01bf49
+  metadata.gz: 3000f6047db32d408b37cbbcceba7f157dab54a9
+  data.tar.gz: 2a403a22449f213ab1f72a54f2b105602b514f46
 SHA512:
-  metadata.gz: 9ddfc1920cc0fb746e7b170558791ea652ab16f8147eeced3e0e6b0900658d9da7322072d8e83f86f7b2db508551d28f372523826e669c0be3d09c68345b160b
-  data.tar.gz: 9ab329a43406bd785e3baff0a289fc504c718490c4c2b9716a72b55ca1a5037cabea18212a1006829fd7b9eaa6f251ce53f3598e620223558e9bef7e9be4930d
+  metadata.gz: 1f73867d54a606a381f352935aa371079e9dbe7b870a1ab35a6c727efee404a2064a2243255a176817802a9bcbb146dfbf0da5b6fd2ec457b442889457997310
+  data.tar.gz: 597222cfd692849485089f21de2af0cd025b5e1ce8a089863169c0dc30f02ca7db9b124ebbd04cc1543ddd7dc3f1669f2e80973ec8611f8fe538834c3a24e9c6

data/bin/dad

@@ -7,7 +7,7 @@ DADDY_HOME = File.dirname(File.dirname(__FILE__))
 action = ARGV[0]
 
 if action == 'new'
-  RAILS_VERSION = '4.0.9'
+  RAILS_VERSION = '4.0.10'
   puts "using rails #{RAILS_VERSION}"
 
   APP_NAME = ARGV[1]

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.9'.freeze
+  VERSION = '0.3.10'.freeze
 end

data/lib/tasks/cucumber.rake

@@ -1,12 +1,15 @@
 require 'rake'
 
+dependencies = ['environment', 'db:test:prepare']
 unless defined?(Rails)
-  task :environment do; end
+  dependencies.each do |t|
+    task t do; end
+  end
 end
 
 namespace :dad do
 
-  task :cucumber => ['environment', 'db:test:prepare'] do |t, args|
+  task :cucumber => dependencies do |t, args|
     format = ENV['FORMAT'] || 'Daddy::Formatter::Html'
 
     options = [
@@ -28,9 +31,6 @@ namespace :dad do
     output = "features/reports/index.html"
     output = "test/reports" if format == 'junit'
 
-    command = "bundle exec cucumber --guess --quiet --no-multiline -r features --format pretty --format #{format} --out #{output} #{features.join(' ')} #{options}"
-    puts command
-    ret = system(command)
-    fail unless ret
+    run "bundle exec cucumber --guess --quiet --no-multiline -r features --format pretty --format #{format} --out #{output} #{features.join(' ')} #{options}"
   end
 end

data/lib/tasks/jenkins.rake

@@ -1,49 +1,49 @@
-require 'rake'
+require_relative 'task_helper'
 
 namespace :dad do
   namespace :jenkins do
 
     desc 'Jenkinsをインストールします。'
     task :install do
-      commands = [
-        "sudo yum install httpd-devel libxslt-devel libxml2-devel java-1.7.0-openjdk qt-webkit-devel Xvfb firefox",
-        "sudo wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo",
-        "sudo rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key",
-        "sudo yum install jenkins",
-        "sudo cp -f #{File.dirname(__FILE__)}/jenkins.conf /etc/httpd/conf.d",
-        "sudo cp -f #{File.dirname(__FILE__)}/jenkins /etc/sysconfig",
-        "sudo chown root:root /etc/sysconfig/jenkins",
-        "sudo chmod 600 /etc/sysconfig/jenkins",
-        "sudo mkdir -p /var/lib/jenkins/plugins",
-        "sudo chown jenkins:jenkins /var/lib/jenkins/plugins",
-      ]
-      commands.each do |command|
-        puts command
-        system(command)
-      end
+      FileUtils.mkdir_p 'tmp'
+
+      script = File.join(File.dirname(__FILE__), 'jenkins', 'install.sh')
+      run "bash -ex #{script}"
 
       plugins = [
-        {:name => 'build-pipeline-plugin', :version => '1.3.5'},
-        {:name => 'git', :version => '1.4.0'},
-        {:name => 'rake', :version => '1.7.7'},
-        {:name => 'rubyMetrics', :version => '1.5.0'},
-        {:name => 'htmlpublisher', :version => '1.2'},
+        {:name => 'build-pipeline-plugin', :version => '1.4.3'},
+        {:name => 'git', :version => '2.2.5'},
+        {:name => 'git-client', :version => '1.10.2'},
+        {:name => 'rake', :version => '1.8.0'},
+        {:name => 'rubyMetrics', :version => '1.6.2'},
+        {:name => 'htmlpublisher', :version => '1.3'},
+        {:name => 'reverse-proxy-auth-plugin', :version => '1.4.0'},
+        {:name => 'thinBackup', :version => '1.7.4'}
       ]
       plugins.each do |p|
-        download_path = "tmp/#{p[:name]}.hpi"
-
+        download_path = "tmp/#{p[:name]}-#{p[:version]}.hpi"
         unless File.exist?(download_path)
-          command = "sudo wget http://updates.jenkins-ci.org/download/plugins/#{p[:name]}/#{p[:version]}/#{p[:name]}.hpi -O #{download_path}"
-          puts command
-          system(command)
+          run "sudo wget http://updates.jenkins-ci.org/download/plugins/#{p[:name]}/#{p[:version]}/#{p[:name]}.hpi -O #{download_path}"
         end
         
-        command = "sudo cp -f #{download_path} /var/lib/jenkins/plugins/#{p[:name]}.hpi"
-        puts command
-        system(command)
+        run "sudo cp -f #{download_path} /var/lib/jenkins/plugins/#{p[:name]}.hpi"
       end
     end
 
-  end
+    namespace :nginx do
+      desc 'Nginxの設定を行います。'
+      task :config do
+        @server_name = ask('server_name', :required => true)
+        @ssl_certificate = ask('ssl_certificate')
+        @ssl_certificate_key = ask('ssl_certificate_key')
 
+        FileUtils.mkdir_p 'tmp'
+        template = File.join(File.dirname(__FILE__), 'jenkins', 'nginx.conf.erb')
+        render template, :to => 'tmp/jenkins_nginx.conf'
+
+        run "sudo cp -f tmp/jenkins_nginx.conf /etc/nginx/conf.d/servers/jenkins.conf"
+      end
+    end
+
+  end
 end

data/lib/tasks/jenkins/install.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+SCRIPT_BASE=`dirname $0`
+
+sudo yum install java-1.7.0-openjdk
+sudo wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
+sudo rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
+sudo yum install jenkins
+sudo cp -f ${SCRIPT_BASE}/jenkins /etc/sysconfig/jenkins
+sudo chown root:root /etc/sysconfig/jenkins
+sudo chmod 600 /etc/sysconfig/jenkins
+sudo mkdir -p /var/lib/jenkins/plugins
+sudo chown jenkins:jenkins /var/lib/jenkins/plugins

data/lib/tasks/{jenkins → jenkins/jenkins}

@@ -43,7 +43,52 @@ JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
 # Port Jenkins is listening on.
 # Set to -1 to disable
 #
-JENKINS_PORT="8081"
+JENKINS_PORT="8080"
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# IP address Jenkins listens on for HTTP requests.
+# Default is all interfaces (0.0.0.0).
+#
+JENKINS_LISTEN_ADDRESS=""
+
+## Type:        integer(0:65535)
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# HTTPS port Jenkins is listening on.
+# Default is disabled.
+#
+JENKINS_HTTPS_PORT=""
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# Path to the keystore in JKS format (as created by the JDK 'keytool').
+# Default is disabled.
+#
+JENKINS_HTTPS_KEYSTORE=""
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# Password to access the keystore defined in JENKINS_HTTPS_KEYSTORE.
+# Default is disabled.
+#
+JENKINS_HTTPS_KEYSTORE_PASSWORD=""
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# IP address Jenkins listens on for HTTPS requests.
+# Default is disabled.
+#
+JENKINS_HTTPS_LISTEN_ADDRESS=""
 
 ## Type:        integer(0:65535)
 ## Default:     8009
@@ -54,6 +99,15 @@ JENKINS_PORT="8081"
 #
 JENKINS_AJP_PORT="-1"
 
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# IP address Jenkins listens on for Ajp13 requests.
+# Default is all interfaces (0.0.0.0).
+#
+JENKINS_AJP_LISTEN_ADDRESS=""
+
 ## Type:        integer(1:9)
 ## Default:     5
 ## ServiceRestart: jenkins
@@ -94,8 +148,6 @@ JENKINS_HANDLER_IDLE="20"
 # Pass arbitrary arguments to Jenkins.
 # Full option list: java -jar jenkins.war --help
 #
-JENKINS_ARGS="--prefix=/jenkins"
+JENKINS_ARGS=""
 
 export PATH="${PATH}":/usr/local/bin
-export PATH=/opt/rh/qt48/root/usr/bin${PATH:+:${PATH}}
-export LD_LIBRARY_PATH=/opt/rh/qt48/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}

data/lib/tasks/jenkins/nginx.conf.erb

@@ -0,0 +1,27 @@
+upstream jenkins {
+  server localhost:8080;
+}
+
+server {
+  listen 80;
+  listen 443 ssl;
+  server_name <%= @server_name %>;
+  #access_log /var/log/nginx/jenkins_access.log ltsv;
+<% if @ssl_certificate and @ssl_certificate_key -%>
+  ssl_certificate <%= @ssl_certificate %>;
+  ssl_certificate_key <%= @ssl_certificate_key %>;
+<% end -%>
+  root /var/cache/jenkins/war;
+
+  location / {
+    #auth_basic "Jenkins";
+    #auth_basic_user_file conf.d/.htpasswd;
+    proxy_pass http://jenkins;
+    proxy_redirect http:// https://;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-User $remote_user;
+  }
+}

data/lib/tasks/nginx.rake

@@ -1,6 +1,3 @@
-# coding: UTF-8
-
-require 'rake'
 require_relative 'task_helper'
 
 namespace :dad do
@@ -8,27 +5,24 @@ namespace :dad do
 
     desc 'Nginxをインストールします。'
     task :install => :environment do
-      repo = File.dirname(__FILE__) + '/nginx.repo'
+      repo = File.join(File.dirname(__FILE__), 'nginx', 'nginx.repo')
       fail unless system("sudo cp -f #{repo} /etc/yum.repos.d/")
-
-      ret = system("sudo yum install nginx")
-      fail unless ret
+      fail unless system("sudo yum install nginx")
       
-      if File.exist?('/etc/nginx/conf.d/default.conf')
-        system("sudo mv /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf.org")
-      end
-      if File.exist?('/etc/nginx/conf.d/example_ssl.conf')
-        system("sudo mv /etc/nginx/conf.d/example_ssl.conf /etc/nginx/conf.d/example_ssl.conf.org")
+      default_config_files = [
+        '/etc/nginx/conf.d/default.conf',
+        '/etc/nginx/conf.d/example_ssl.conf'
+      ]
+      default_config_files.each do |conf|
+        run "sudo mv #{conf} #{conf}.org" if File.exist?(conf)
       end
 
-      rails_root = ENV['RAILS_ROOT'] || Rails.root
-      jenkins = ENV['JENKINS'] || false
-      publish = ENV['PUBLISH'] || false
-
-      fail unless system("RAILS_ROOT=#{rails_root} RAILS_ENV=#{Rails.env} erb -T - #{File.dirname(__FILE__)}/nginx.conf.erb > tmp/nginx.conf")
+      template = File.join(File.dirname(__FILE__), 'nginx', 'nginx.conf.erb')
+      render template, :to => 'tmp/nginx.conf'
+      run "sudo cp -f tmp/nginx.conf /etc/nginx/conf.d/nginx.conf"
+      run "sudo mkdir -p /etc/nginx/conf.d/servers"
 
-      system("sudo cp -f tmp/nginx.conf /etc/nginx/conf.d/nginx.conf")
-      
+      publish = ENV['PUBLISH'] || false
       if publish
         system("sudo mkdir -p /var/lib/daddy")
         system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} /var/lib/daddy")
@@ -42,12 +36,5 @@ namespace :dad do
       system("sudo cp -f tmp/nginx.#{app_name}.conf /etc/nginx/conf.d/servers/#{app_name}.conf")
     end
 
-    desc 'NginxにJenkinsの設定ファイルをインストールします。'
-    task :jenkins => :environment do
-      fail unless system("erb -T - #{File.dirname(__FILE__)}/nginx.jenkins.conf.erb > tmp/nginx.jenkins.conf")
-      system("sudo mkdir -p /etc/nginx/conf.d/servers") 
-      system("sudo cp -f tmp/nginx.jenkins.conf /etc/nginx/conf.d/servers/jenkins.conf")
-    end
-
   end
 end

data/lib/tasks/nginx/nginx.repo

@@ -0,0 +1,5 @@
+[nginx]
+name=nginx repo
+baseurl=http://nginx.org/packages/centos/6/$basearch/
+gpgcheck=0
+enabled=1

data/lib/tasks/redis.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 
 namespace :dad do

data/lib/tasks/task_helper.rb

@@ -1,3 +1,4 @@
+require 'rake'
 require 'erb'
 require 'yaml'
 
@@ -19,4 +20,40 @@ end
 
 def self.render(template, options = {})
   File.write(options[:to], ERB.new(File.read(template), 0, '-').result)
+end
+
+def self.ask(prompt, options = {})
+  if options[:default]
+    print prompt + "[#{options[:default]}]: "
+  else
+    print prompt + ": "
+  end
+
+  if options[:password]
+    system("stty -echo")
+    at_exit do
+      system("stty echo")
+    end
+  end
+
+  answer = STDIN.gets.strip
+  answer = options[:default] if answer.blank?
+
+  if options[:password]
+    system("stty echo")
+    puts
+  end
+
+  if options[:required] and answer.blank?
+    raise "必須です。処理を中止します。"
+  end
+
+  answer.blank? ? nil : answer
+end
+
+def self.run(*commands)
+  commands.each do |c|
+    puts c
+    fail unless system(c)
+  end
 end

data/lib/tasks/test.rake

@@ -1,6 +1,4 @@
-# coding: UTF-8
-
-require 'rake'
+require_relative 'task_helper'
 
 namespace :dad do
   
@@ -17,8 +15,6 @@ namespace :dad do
       args << arg
     end
 
-    command = "bundle exec rake dad:cucumber #{args.join(' ')}"
-    puts command
-    fail unless system(command)
+    run "bundle exec rake dad:cucumber #{args.join(' ')}"
   end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -336,17 +336,17 @@ files:
 - lib/tasks/god/install.sh
 - lib/tasks/god/logrotate
 - lib/tasks/god/master.conf
-- lib/tasks/jenkins
-- lib/tasks/jenkins.conf
 - lib/tasks/jenkins.rake
+- lib/tasks/jenkins/install.sh
+- lib/tasks/jenkins/jenkins
+- lib/tasks/jenkins/nginx.conf.erb
 - lib/tasks/kibana.rake
 - lib/tasks/kibana/config.js
 - lib/tasks/kibana/install.sh
 - lib/tasks/nginx.app.conf.erb
-- lib/tasks/nginx.conf.erb
-- lib/tasks/nginx.jenkins.conf.erb
 - lib/tasks/nginx.rake
-- lib/tasks/nginx.repo
+- lib/tasks/nginx/nginx.conf.erb
+- lib/tasks/nginx/nginx.repo
 - lib/tasks/phantomjs.rake
 - lib/tasks/publish.rake
 - lib/tasks/redis.rake
@@ -390,8 +390,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: My rails dad
 test_files: []
+has_rdoc: 

data/lib/tasks/jenkins.conf

@@ -1,3 +0,0 @@
-ProxyPass /jenkins http://localhost:8081/jenkins
-ProxyPassReverse  /jenkins  http://localhost:8081/jenkins
-ProxyRequests     Off

data/lib/tasks/nginx.jenkins.conf.erb

@@ -1,12 +0,0 @@
-server {
-  listen 80;
-  server_name localhost;
-  
-  location /jenkins/ {
-    root /var/cache/jenkins/war;
-    proxy_pass http://localhost:8081/jenkins/;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
-}

data/lib/tasks/nginx.repo

@@ -1,5 +0,0 @@
-[nginx]
-name=nginx repo
-baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
-gpgcheck=0
-enabled=1