capper 2.0.0.rc3 → 2.0.0

data/README.rst

@@ -195,7 +195,8 @@ rvm
 
 The rvm recipe is an extension to RVMs native capistrano integration. The
 recipe forces the ``rvm_type`` to ``:user`` and will automatically determine
-the ruby version and gemset via the projects ``.rvmrc``.
+the ruby version and gemset via the projects ``.ruby-version`` and
+``.ruby-gemset`` files.
 
 A ``deploy:setup`` hook is provided to ensure the correct rvm, ruby and rubygems
 versions are installed on all servers.

data/capper.gemspec

@@ -1,10 +1,8 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "capper/version"
 
 Gem::Specification.new do |s|
   s.name = "capper"
-  s.version = Capper::VERSION
+  s.version = "2.0.0"
   s.authors = ["Benedikt Böhm"]
   s.email = ["bb@xnull.de"]
   s.homepage = "http://github.com/zenops/capper"
@@ -18,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "erubis"
   s.add_dependency "dedent"
-  s.add_dependency "capistrano", "~> 2.12.0"
-  s.add_dependency "capistrano_colors", "~> 0.5.5"
-  s.add_dependency "rvm-capistrano", "~> 1.2.7"
+  s.add_dependency "capistrano"
+  s.add_dependency "capistrano_colors"
+  s.add_dependency "rvm-capistrano"
 end

data/lib/capper.rb

@@ -1,7 +1,5 @@
 require "dedent"
 
-require "capper/version"
-
 # mixin various helpers
 require 'capper/utils/templates'
 include Capper::Utils::Templates
@@ -15,7 +13,7 @@ include Capper::Utils::Systemd
 # see https://github.com/capistrano/capistrano/issues/168
 Capistrano::Configuration::Namespaces::Namespace.class_eval do
   def capture(*args)
-    parent.capture *args
+    parent.capture(*args)
   end
 end
 

data/lib/capper/bundler.rb

@@ -8,24 +8,5 @@ set(:ruby_exec_prefix, "bundle exec")
 # do not install a global bundle if rvm has been enabled
 # instead, use the gemset selected by rvm_ruby_string
 set(:bundle_dir) do
-  begin
-    File.join(shared_path, 'bundle', rvm_ruby_string)
-  rescue NoMethodError, NameError
-    File.join(shared_path, 'bundle')
-  end
-end
-
-# freeze bundler version
-_cset(:bundler_version, "1.2.3")
-
-before "bundle:install", "bundle:setup"
-
-namespace :bundle do
-  desc "Setup bundler"
-  task :setup, :except => {:no_release => true} do
-    run "if ! gem query -i -n ^bundler$ -v #{bundler_version} >/dev/null; then " +
-        "gem install bundler -v #{bundler_version}; " +
-        "fi"
-    run "mkdir -p #{bundle_dir}"
-  end
+  File.join([shared_path, 'bundle', fetch(:rvm_ruby_string_evaluated, nil)].compact)
 end

data/lib/capper/rvm.rb

@@ -4,21 +4,14 @@ load "capper/ruby"
 require "capistrano"
 Kernel.const_set("Capistrano", Capistrano)
 
-require "rvm/capistrano"
-
-set(:rvm_type, :user)
-set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm( use)? --create (.*)/, '\2').strip)
+set(:rvm_ruby_string, :local)
 
-_cset(:rvm_version, "1.18.18")
-set(:rvm_install_type) { rvm_version }
+require "rvm/capistrano"
 
 before "deploy:setup", "rvm:install_ruby"
 before "rvm:install_ruby", "rvm:install_rvm"
 before "rvm:install_rvm", "rvm:install_rvmrc"
 after "rvm:install_ruby", "rvm:auto_gem"
-after "rvm:install_ruby", "rvm:install_rubygems"
-
-after "deploy:create_symlink", "rvm:trust_rvmrc"
 
 namespace :rvm do
   desc "Install a global .rvmrc"
@@ -34,18 +27,10 @@ export rvm_gem_options="--no-rdoc --no-ri"
 
   desc "Ensure that Gentoos declare -x RUBYOPT=\"-rauto_gem\" is ignored"
   task :auto_gem do
-    wo_gemset = rvm_ruby_string.split('@').first
+    wo_gemset = fetch(:rvm_ruby_string_evaluated).to_s.split('@').first
     run "touch ~/.rvm/rubies/#{wo_gemset}/lib/ruby/site_ruby/auto_gem.rb"
   end
 
-  desc "Install the specified rubygems version"
-  task :install_rubygems do
-    # if specified freeze rubygems version, otherwise don't touch it
-    if fetch(:rvm_rubygems_version, false)
-      run("rvm rubygems #{rvm_rubygems_version}")
-    end
-  end
-
   desc "Clear the current gemset"
   task :empty do
     run "cd #{current_release} && rvm --force gemset empty"
@@ -55,10 +40,4 @@ export rvm_gem_options="--no-rdoc --no-ri"
   task :reinstall do
     set(:rvm_install_ruby, :reinstall)
   end
-
-  # prevents interactive rvm dialog
-  task :trust_rvmrc, :except => {:no_release => true} do
-    run "rvm rvmrc trust #{release_path} >/dev/null"
-    run "rvm rvmrc trust #{current_path} >/dev/null"
-  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Benedikt Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -48,49 +48,49 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '0'
 description: Capper is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de
@@ -100,7 +100,6 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -140,7 +139,6 @@ files:
 - lib/capper/utils/systemd.rb
 - lib/capper/utils/templates.rb
 - lib/capper/uwsgi.rb
-- lib/capper/version.rb
 - lib/capper/virtualenv.rb
 - lib/capper/whenever.rb
 homepage: http://github.com/zenops/capper
@@ -158,13 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Capper is a collection of opinionated Capistrano recipes
 test_files: []
+has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create ruby-1.9.3-p194@capper

data/lib/capper/version.rb

@@ -1,3 +0,0 @@
-module Capper
-  VERSION = "2.0.0.rc3"
-end