capistrano-foreman 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5938a6e7555b79410d32279c0634bb3319e3d668
+  data.tar.gz: e0b9fb4b1b2f787f6d093f0408643ad723fcc00e
+SHA512:
+  metadata.gz: c0f04d9f7fa93dde0c3950fb6ba97b99ae4c825f144fff7e24031555e9391a662bbf46b9513b961eab36172b7ce18f3649f9a728dacef2ff3d14b8063c20275b
+  data.tar.gz: b8bcc2cf08aec5edebfd61304f97006d273e43f43ba3b4819ec199644a193aa20b618dc487d0633e65fbf648dd7e1328bb02d30e13566cc0623caf0cfad428bc

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2012 Johannes Gorset
+Copyright (c) 2013-2014 John Bellone
 
 MIT License
 

data/LICENSE.md

@@ -0,0 +1,22 @@
+Licensed under the **MIT** license
+
+> Copyright (c) 2014 Hyper Interaktiv AS
+>
+> Permission is hereby granted, free of charge, to any person obtaining
+> a copy of this software and associated documentation files (the
+> "Software"), to deal in the Software without restriction, including
+> without limitation the rights to use, copy, modify, merge, publish,
+> distribute, sublicense, and/or sell copies of the Software, and to
+> permit persons to whom the Software is furnished to do so, subject to
+> the following conditions:
+>
+> The above copyright notice and this permission notice shall be
+> included in all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+> IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+> CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+> TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Capistrano Foreman
 
-[![Code Climate](https://codeclimate.com/github/hyperoslo/capistrano-foreman.png)](https://codeclimate.com/github/hyperoslo/capistrano-foreman)
+[![Code Climate](https://img.shields.io/codeclimate/github/hyperoslo/capistrano-foreman.svg?style=flat)](https://codeclimate.com/github/hyperoslo/capistrano-foreman)
 
 Capistrano tasks for foreman and upstart.
 
@@ -14,12 +14,13 @@ Add this to your `Capfile`:
 require 'capistrano/foreman'
 
 # Default settings
-set :foreman_sudo, 'sudo'                    # Set to `rvmsudo` if you're using RVM
-set :foreman_upstart_path, '/etc/init/sites' # Set to `/etc/init/` if you don't have a sites folder
+set :foreman_use_sudo, false
+set :foreman_roles, :all
+set :foreman_template, 'upstart'
+set :foreman_export_path, File.join(Dir.home, '.init')
 set :foreman_options, {
   app: application,
-  log: "#{shared_path}/log",
-  user: user,
+  log: File.join(shared_path, 'log')
 }
 ```
 
@@ -29,11 +30,11 @@ See [exporting options](http://ddollar.github.io/foreman/#EXPORTING0) for an exh
 
 Export Procfile to upstart:
 
-    $ cap foreman:export
+    $ bundle exec cap production foreman:export
 
 Restart the application services:
 
-    $ cap foreman:restart
+    $ bundle exec cap production foreman:restart
 
 ## Credits
 

data/capistrano-foreman.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/capistrano/version', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Johannes Gorset"]
-  gem.email         = ["jgorset@gmail.com"]
+  gem.authors       = ["Johannes Gorset", 'John Bellone']
+  gem.email         = ["jgorset@gmail.com", 'jbellone@bloomberg.net']
   gem.description   = "Capistrano tasks for foreman and upstart."
   gem.summary       = "Capistrano tasks for foreman and upstart."
   gem.homepage      = "http://github.com/hyperoslo/capistrano-foreman"
@@ -13,5 +14,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "capistrano-foreman"
   gem.require_paths = ["lib"]
-  gem.version       = Capistrano::Foreman::VERSION
+  gem.version       = '1.1.0'
+
+  gem.add_dependency 'capistrano', '~> 3.1'
+  gem.add_dependency 'capistrano-bundler', '~> 1.1'
 end

data/lib/capistrano-foreman.rb

@@ -1,6 +0,0 @@
-require "capistrano/version"
-
-module Capistrano
-  module Foreman
-  end
-end

data/lib/capistrano/foreman.rb

@@ -1,44 +1 @@
-Capistrano::Configuration.instance(:must_exist).load do |configuration|
-
-  _cset :foreman_sudo, "sudo"
-  _cset :foreman_upstart_path, "/etc/init/sites"
-  _cset :foreman_options, {}
-  _cset :foreman_use_binstubs, false
-
-  namespace :foreman do
-    desc "Export the Procfile to Ubuntu's upstart scripts"
-    task :export, roles: :app do
-      cmd = foreman_use_binstubs ? 'bin/foreman' : 'bundle exec foreman'
-      run "if [[ -d #{foreman_upstart_path} ]]; then #{foreman_sudo} mkdir -p #{foreman_upstart_path}; fi"
-      run "cd #{release_path} && #{foreman_sudo} #{cmd} export upstart #{foreman_upstart_path} #{format(options)}"
-    end
-
-    desc "Start the application services"
-    task :start, roles: :app do
-      sudo "service #{options[:app]} start"
-    end
-
-    desc "Stop the application services"
-    task :stop, roles: :app do
-      sudo "service #{options[:app]} stop"
-    end
-
-    desc "Restart the application services"
-    task :restart, roles: :app do
-      run "sudo service #{options[:app]} start || sudo service #{options[:app]}  restart"
-    end
-
-    def options
-      {
-        app: application,
-        log: "#{shared_path}/log",
-        user: user
-      }.merge foreman_options
-    end
-
-    def format opts
-      opts.map { |opt, value| "--#{opt}='#{value}'" }.join " "
-    end
-  end
-  
-end
+load File.expand_path('../tasks/foreman.rb', __FILE__)

data/lib/capistrano/tasks/foreman.rb

@@ -0,0 +1,54 @@
+namespace :foreman do
+  task :setup do
+    invoke :'foreman:export'
+    invoke :'foreman:start'
+  end
+
+  desc 'Export the Procfile'
+  task :export do
+    on roles fetch(:foreman_roles) do
+      within release_path do
+        opts = {
+          app: fetch(:application),
+          log: File.join(shared_path, 'log'),
+        }.merge fetch(:foreman_options, {})
+
+        execute :foreman, 'export',
+          fetch(:foreman_template),
+          fetch(:foreman_export_path),
+          opts.map { |opt, value| "--#{opt}='#{value}'" }.join(' ')
+      end
+    end
+  end
+
+  desc 'Start the application services'
+  task :start do
+    on roles fetch(:foreman_roles) do
+      sudo :start, fetch(:foreman_app)
+    end
+  end
+
+  desc 'Stop the application services'
+  task :stop do
+    on roles fetch(:foreman_roles) do
+      sudo :stop, fetch(:foreman_app)
+    end
+  end
+
+  desc 'Restart the application services'
+  task :restart do
+    on roles fetch(:foreman_roles) do
+      sudo :restart, fetch(:foreman_app)
+    end
+  end
+end
+
+namespace :load do
+  task :defaults do
+    set :bundle_bins, fetch(:bundle_bins, []).push(%w(foreman))
+    set :foreman_template, 'upstart'
+    set :foreman_export_path, '/etc/init/sites'
+    set :foreman_roles, :all
+    set :foreman_app, -> { fetch(:application) }
+  end
+end

metadata

@@ -1,54 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-foreman
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Johannes Gorset
+- John Bellone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
-dependencies: []
+date: 2014-11-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: capistrano-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Capistrano tasks for foreman and upstart.
 email:
 - jgorset@gmail.com
+- jbellone@bloomberg.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - capistrano-foreman.gemspec
 - lib/capistrano-foreman.rb
 - lib/capistrano/foreman.rb
-- lib/capistrano/version.rb
+- lib/capistrano/tasks/foreman.rb
 homepage: http://github.com/hyperoslo/capistrano-foreman
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Capistrano tasks for foreman and upstart.
 test_files: []

data/lib/capistrano/version.rb

@@ -1,5 +0,0 @@
-module Capistrano
-  module Foreman
-    VERSION = "1.0.0"
-  end
-end