railshoster 0.6.8 → 0.6.9

data/CHANGELOG.textile

@@ -89,3 +89,8 @@ h3. 0.6.6
 h3. 0.6.7
 
 * Get an error if no ssh key or ssh-direcotry exists
+
+h3. 0.6.9
+
+* Support GLI 1.x.x and 2.x.x
+

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 gem 'rspec', :group => :development
 
 group :test do
+  gem 'rake'
   gem 'fakefs'
   gem 'mocha'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railshoster (0.6.6)
+    railshoster (0.6.9)
       bundler (>= 1.0.15)
       capistrano
       capistrano-ext
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.11.2)
+    capistrano (2.12.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -26,9 +26,9 @@ GEM
     erubis (2.7.0)
     fakefs (0.4.0)
     git (1.2.5)
-    gli (1.5.1)
-    highline (1.6.11)
-    json (1.6.5)
+    gli (2.0.0)
+    highline (1.6.12)
+    json (1.7.3)
     metaclass (0.0.1)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
@@ -36,10 +36,11 @@ GEM
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     os (0.9.6)
+    rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -58,4 +59,5 @@ DEPENDENCIES
   fakefs
   mocha
   railshoster!
+  rake
   rspec

data/bin/railshoster

@@ -7,7 +7,10 @@ require 'fileutils'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'railshoster'))
 
 require 'gli'
-include GLI
+
+gli_version_greater_than_2 = GLI::VERSION >= '2.0.0'
+
+include gli_version_greater_than_2 ? GLI::App : GLI
 
 version Railshoster::VERSION
 
@@ -144,4 +147,8 @@ def ask_for_project_dir(current_working_dir)
   end      
 end
 
-exit GLI.run(ARGV)
+if gli_version_greater_than_2
+  exit run(ARGV)
+else 
+  exit GLI.run(ARGV)
+end

data/lib/railshoster/version.rb

@@ -1,3 +1,3 @@
 module Railshoster
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,190 +1,145 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: railshoster
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.6.9
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 8
-  version: 0.6.8
 platform: ruby
-authors: 
+authors:
 - Julian Fischer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &13150620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 0
-        - 15
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.15
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *13150620
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &13150100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano-ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *13150100
+- !ruby/object:Gem::Dependency
+  name: capistrano-ext
+  requirement: &13149380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: gli
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *13149380
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: &13148580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *13148580
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &13163980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: git
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *13163980
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &13163100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *13163100
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &13162440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sane
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *13162440
+- !ruby/object:Gem::Dependency
+  name: sane
+  requirement: &13161880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *13161880
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &13161200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *13161200
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &13160520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *13160520
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &13160020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *13160020
 description: Easily deploy your Rails app to RailsHoster.com by using this gem.
-email: 
+email:
 - fischer@enterprise-rails.de
-executables: 
+executables:
 - railshoster
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.textile
@@ -238,36 +193,32 @@ files:
 - templates/h/deploy.rb.erb
 homepage: http://www.railshoster.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4337555120511314870
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -4337555120511314870
 requirements: []
-
 rubyforge_project: railshoster
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RailsHoster Applicatoin Deployment Suite
 test_files: []
-