capistrano-upstart 0.0.3 → 0.1.0

data/README.md

@@ -21,9 +21,10 @@ Or install it yourself as:
 This recipes will try to set up Upstart service after `deploy:setup` tasks.
 To enable this recipe for your application,  add following in you `config/deploy.rb`.
 
-    # in "config/deploy.rb"
-    require 'capistrano-upstart'
-    set(:upstart_script, <<-EOS)
+    # config/deploy.rb
+    require "capistrano-upstart"
+    set :upstart_service_name, "hello"
+    set :upstart_script, <<-EOS
       exec echo "hello, world"
     EOS
 

data/capistrano-upstart.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency("capistrano")
-  gem.add_dependency("capistrano-file-resources", "~> 0.0.1")
-  gem.add_dependency("capistrano-file-transfer-ext", "~> 0.0.3")
+  gem.add_dependency("capistrano-file-resources", ">= 0.1.0")
+  gem.add_dependency("capistrano-file-transfer-ext", ">= 0.1.1")
+  gem.add_development_dependency("net-scp", "~> 1.0.4")
+  gem.add_development_dependency("net-ssh", "~> 2.2.2")
+  gem.add_development_dependency("vagrant", "~> 1.0.6")
 end

data/lib/capistrano-upstart.rb

@@ -1,7 +1,6 @@
 require "capistrano-upstart/version"
 require "capistrano/configuration/actions/file_transfer_ext"
 require "capistrano/configuration/resources/file_resources"
-require "erb"
 
 module Capistrano
   module Upstart
@@ -51,10 +50,10 @@ module Capistrano
           }
 
           _cset(:upstart_chdir) { current_path }
-          _cset(:upstart_console, 'none')
+          _cset(:upstart_console, "none")
           _cset(:upstart_respawn, true)
           _cset(:upstart_options) {{
-            "author" => fetch(:upstart_author, 'unknown').to_s.dump,
+            "author" => fetch(:upstart_author, "unknown").to_s.dump,
             "chdir" => upstart_chdir,
             "console" => upstart_console,
             "description" => fetch(:upstart_description, application).to_s.dump,
@@ -67,39 +66,45 @@ module Capistrano
               configure
             }
           }
-          after 'deploy:setup', 'upstart:setup'
+          after "deploy:setup", "upstart:setup"
 
+          _cset(:upstart_default_configure_options) {{
+            :install => :if_modified, :run_method => :sudo,
+            :owner => "root", :group => "root", :mode => "644",
+          }}
           task(:configure, :roles => :app, :except => { :no_release => true }) {
             t = upstart_template_files.find { |f|
               File.file?(File.join(upstart_template_source_path, "#{f}.erb")) or File.file?(File.join(upstart_template_source_path, f))
             }
-            abort("could not find template for upstart configuration file for `#{upstart_service_name}'.") unless t
-            safe_put(template(t, :path => upstart_template_source_path), upstart_service_file, :place => :if_modified, :sudo => true)
+            abort("Could not find template for upstart configuration file for `#{upstart_service_name}'.") unless t
+            safe_put(template(t, :path => upstart_template_source_path),
+                     upstart_service_file,
+                     upstart_default_configure_options.merge(fetch(:upstart_configure_options, {})))
           }
 
           desc("Start upstart service.")
           task(:start, :roles => :app, :except => { :no_release => true }) {
-            run("#{sudo} service #{upstart_service_name} start")
+            run("#{sudo} start #{upstart_service_name.dump}")
           }
 
           desc("Stop upstart service.")
           task(:stop, :roles => :app, :except => { :no_release => true }) {
-            run("#{sudo} service #{upstart_service_name} stop")
+            run("#{sudo} stop #{upstart_service_name.dump}")
           }
 
           desc("Restart upstart service.")
           task(:restart, :roles => :app, :except => { :no_release => true }) {
-            run("#{sudo} service #{upstart_service_name} restart || #{sudo} service #{upstart_service_name} start")
+            run("#{sudo} restart #{upstart_service_name.dump} || #{sudo} start #{upstart_service_name.dump}")
           }
 
           desc("Reload upstart service.")
           task(:reload, :roles => :app, :except => { :no_release => true }) {
-            run("#{sudo} service #{upstart_service_name} reload || #{sudo} service #{upstart_service_name} start")
+            run("#{sudo} reload #{upstart_service_name.dump} || #{sudo} start #{upstart_service_name.dump}")
           }
 
           desc("Show upstart service status.")
           task(:status, :roles => :app, :except => { :no_release => true }) {
-            run("#{sudo} service #{upstart_service_name} status")
+            run("#{sudo} status #{upstart_service_name.dump}")
           }
         }
       }

data/lib/capistrano-upstart/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Upstart
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/test/centos6-64/.gitignore

@@ -0,0 +1,5 @@
+/.bundle
+/.vagrant
+/known_hosts
+/tmp
+/vendor

data/test/centos6-64/Capfile

@@ -0,0 +1,2 @@
+load "deploy"
+load "../config/deploy"

data/test/centos6-64/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec(:path => "../..")

data/test/centos6-64/Vagrantfile

@@ -0,0 +1,99 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "centos6-64"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.3-x86_64-v20130101.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  config.vm.network :hostonly, "192.168.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file precise-amd64.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "precise-amd64.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding 
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/test/centos6-64/run.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+bundle exec vagrant up
+bundle exec cap test_all
+bundle exec vagrant halt
+
+# vim:set ft=sh :

data/test/config/deploy.rb

@@ -0,0 +1,106 @@
+set :application, "capistrano-upstart"
+set :repository, "."
+set :deploy_to do
+  File.join("/home", user, application)
+end
+set :deploy_via, :copy
+set :scm, :none
+set :use_sudo, false
+set :user, "vagrant"
+set :password, "vagrant"
+set :ssh_options, {:user_known_hosts_file => "/dev/null"}
+
+## upstart ##
+set(:upstart_service_name, "capistrano-upstart")
+set(:upstart_script, <<-EOS)
+  echo "hello, world"
+EOS
+
+role :web, "192.168.33.10"
+role :app, "192.168.33.10"
+role :db,  "192.168.33.10", :primary => true
+
+$LOAD_PATH.push(File.expand_path("../../lib", File.dirname(__FILE__)))
+require "capistrano-upstart"
+
+def assert_file_exists(file, options={})
+  begin
+    _invoke_command("test -f #{file.dump}", options)
+  rescue
+    logger.debug("assert_file_exists(#{file}) failed.")
+    _invoke_command("ls #{File.dirname(file).dump}", options)
+    raise
+  end
+end
+
+def assert_file_not_exists(file, options={})
+  begin
+    _invoke_command("test \! -f #{file.dump}", options)
+  rescue
+    logger.debug("assert_file_not_exists(#{file}) failed.")
+    _invoke_command("ls #{File.dirname(file).dump}", options)
+    raise
+  end
+end
+
+def assert_command(cmdline, options={})
+  begin
+    _invoke_command(cmdline, options)
+  rescue
+    logger.debug("assert_command(#{cmdline}) failed.")
+    raise
+  end
+end
+
+def assert_command_fails(cmdline, options={})
+  failed = false
+  begin
+    _invoke_command(cmdline, options)
+  rescue
+    logger.debug("assert_command_fails(#{cmdline}) failed.")
+    failed = true
+  ensure
+    abort unless failed
+  end
+end
+
+def reset_upstart!
+  variables.each_key do |key|
+    reset!(key) if /^upstart_/ =~ key
+  end
+end
+
+def uninstall_services!
+  sudo("service #{upstart_service_name.dump} stop || true")
+  sudo("rm -f #{upstart_service_file.dump}")
+end
+
+task(:test_all) {
+  find_and_execute_task("test_default")
+}
+
+on(:start) {
+  run("rm -rf #{deploy_to.dump}")
+}
+
+namespace(:test_default) {
+  task(:default) {
+    methods.grep(/^test_/).each do |m|
+      send(m)
+    end
+  }
+  before "test_default", "test_default:setup"
+  after "test_default", "test_default:teardown"
+
+  task(:setup) {
+    uninstall_services!
+    find_and_execute_task("deploy:setup")
+    find_and_execute_task("deploy")
+  }
+
+  task(:teardown) {
+    uninstall_services!
+  }
+}
+
+# vim:set ft=ruby sw=2 ts=2 :

data/test/config/templates/global.sbt.erb

@@ -0,0 +1 @@
+credentials += Credentials("My Repository", "repository.example.com", "username", "password")

data/test/precise64/.gitignore

@@ -0,0 +1,5 @@
+/.bundle
+/.vagrant
+/known_hosts
+/tmp
+/vendor

data/test/precise64/Capfile

@@ -0,0 +1,2 @@
+load "deploy"
+load "../config/deploy"

data/test/precise64/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec(:path => "../..")

data/test/precise64/Vagrantfile

@@ -0,0 +1,99 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "precise64"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  config.vm.network :hostonly, "192.168.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file precise-amd64.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "precise-amd64.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding 
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/test/precise64/run.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+bundle exec vagrant up
+bundle exec cap test_all
+bundle exec vagrant halt
+
+# vim:set ft=sh :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-upstart
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -32,33 +32,81 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: capistrano-file-transfer-ext
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.6
 description: a capistrano recipe to manage upstart serivce.
 email:
 - yamashita@geishatokyo.com
@@ -75,6 +123,18 @@ files:
 - lib/capistrano-upstart.rb
 - lib/capistrano-upstart/version.rb
 - lib/templates/upstart.conf.erb
+- test/centos6-64/.gitignore
+- test/centos6-64/Capfile
+- test/centos6-64/Gemfile
+- test/centos6-64/Vagrantfile
+- test/centos6-64/run.sh
+- test/config/deploy.rb
+- test/config/templates/global.sbt.erb
+- test/precise64/.gitignore
+- test/precise64/Capfile
+- test/precise64/Gemfile
+- test/precise64/Vagrantfile
+- test/precise64/run.sh
 homepage: https://github.com/yyuu/capistrano-upstart
 licenses: []
 post_install_message: 
@@ -99,4 +159,16 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: a capistrano recipe to manage upstart serivce.
-test_files: []
+test_files:
+- test/centos6-64/.gitignore
+- test/centos6-64/Capfile
+- test/centos6-64/Gemfile
+- test/centos6-64/Vagrantfile
+- test/centos6-64/run.sh
+- test/config/deploy.rb
+- test/config/templates/global.sbt.erb
+- test/precise64/.gitignore
+- test/precise64/Capfile
+- test/precise64/Gemfile
+- test/precise64/Vagrantfile
+- test/precise64/run.sh