railshoster 0.6.10 → 0.6.11

data/CHANGELOG.textile

@@ -98,3 +98,9 @@ h3. 0.6.10
 
 * Ask for ssh password if the init-hash doesn't work
 
+h3. 0.6.11
+
+* Bugfix: The appurl command now works even with ruby 1.9.2
+* Bugfix: No need to include rails in the Gemfile if it is already required from an other gem
+* Bugfix: Rails compatibility problem
+

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    railshoster (0.6.10)
+    railshoster (0.6.11)
+      activesupport
       bundler (>= 1.0.15)
       capistrano
       capistrano-ext
@@ -9,12 +10,14 @@ PATH
       git
       gli (>= 1.2.5)
       json
-      sane
 
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.12.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    capistrano (2.13.3)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -26,12 +29,14 @@ GEM
     erubis (2.7.0)
     fakefs (0.4.0)
     git (1.2.5)
-    gli (2.0.0)
-    highline (1.6.12)
-    json (1.7.3)
+    gli (2.1.0)
+    highline (1.6.15)
+    i18n (0.6.1)
+    json (1.7.5)
     metaclass (0.0.1)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -39,8 +44,6 @@ GEM
     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)
@@ -49,8 +52,6 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sane (0.25.3)
-      os
 
 PLATFORMS
   ruby
@@ -59,5 +60,4 @@ DEPENDENCIES
   fakefs
   mocha
   railshoster!
-  rake
   rspec

data/gemfiles/Gemfile.ci

@@ -7,7 +7,7 @@ gem "gli", ">= 1.2.5"
 gem "json"
 gem "git"
 gem 'erubis'
-gem 'sane'
+gem 'activesupport'
 
 group :test do
   gem 'rspec'

data/lib/init.rb

@@ -3,4 +3,4 @@ gem "json"
 gem "git"
 gem "erubis"
 gem "gli"
-gem "sane"
+gem "activesupport"

data/lib/railshoster/init_command.rb

@@ -102,7 +102,7 @@ module Railshoster
       case @app_hash["t"].to_sym
         when :h
           @app_hash["deploy_to"]      = "/home/#{@app_hash['u']}/#{@app_hash['a']}"
-          @app_hash["app_url"]        = "http://#{@app_hash['u']}-#{@app_hash['aid']}.#{@app_hash['h']}"
+          @app_hash["app_url"]        = "http://#{@app_hash['u']}-#{@app_hash['aid']}.#{@app_hash['h'].first}"
         when :v
           @app_hash["deploy_to"]      = "/var/www/#{@app_hash['a']}"
           @app_hash["app_url"]        = "http://#{@app_hash['a']}.#{@app_hash['h']}"

data/lib/railshoster/init_validation_helpers.rb

@@ -1,4 +1,3 @@
-require 'sane'
 
 module Railshoster
   
@@ -37,12 +36,12 @@ module Railshoster
     end
         
     def check_os
-      if OS.windows? then
+      if RUBY_PLATFORM.downcase.include?("mswin") then
         puts "\nWarning: This software requires a Unix/Linux/BSD OS. Do you really want to proceed?"
         decision = STDIN.gets.chomp
         unless %w(y Y).include?(decision) then
           raise("Initialization aborted. Bad operating system.")
-        end              
+        end           
       end
     end        
   end

data/lib/railshoster/version.rb

@@ -1,3 +1,3 @@
 module Railshoster
-  VERSION = "0.6.10"
+  VERSION = "0.6.11"
 end

data/railshoster.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "git"
   s.add_dependency "erubis"
-  s.add_dependency "sane"
+  s.add_dependency "activesupport"
   
   s.add_development_dependency('rspec')
   s.add_development_dependency('fakefs')

data/templates/h/deploy.rb.erb

@@ -15,26 +15,14 @@ def gemfile_lock_exists?
 end
 
 def rails_version
-  if gemfile_exists? 
-    rails_v = (Proc.new {
-      file = File.new("Gemfile", "r")
-      while (line = file.gets)
-        if line =~ /^\s*gem\s+[\"\']rails[\"\'].+/
-        version = line.scan(/(\d+)\.(\d+)\.(\d+)/).first.map {|x| x.to_i}
-      end
-    end
-    file.close
-    version
-    }).call
-  else 
-    rails_v = nil
-  end
-    return rails_v
+  stdout = `bundle list rails`
+  matches = stdout.scan(/\/rails-(\d+\.\d+\.\d+)$/).first
+  matches ? matches.first : nil
 end
 
 def rails_version_supports_assets?
-  rails_v = rails_version
-  return rails_v != nil && rails_v[0] >= 3 && rails_v[1] >= 1
+  rv = rails_version
+  rv ? rv >= "3.1.0" : false
 end
 
 if gemfile_exists? && gemfile_lock_exists?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railshoster
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10310200 !ruby/object:Gem::Requirement
+  requirement: &15980240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *10310200
+  version_requirements: *15980240
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &10325700 !ruby/object:Gem::Requirement
+  requirement: &15979820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10325700
+  version_requirements: *15979820
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &10324600 !ruby/object:Gem::Requirement
+  requirement: &15979360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10324600
+  version_requirements: *15979360
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &10323840 !ruby/object:Gem::Requirement
+  requirement: &15978860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *10323840
+  version_requirements: *15978860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10323300 !ruby/object:Gem::Requirement
+  requirement: &15978440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10323300
+  version_requirements: *15978440
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &10322500 !ruby/object:Gem::Requirement
+  requirement: &15977980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10322500
+  version_requirements: *15977980
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &10321880 !ruby/object:Gem::Requirement
+  requirement: &15977560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10321880
+  version_requirements: *15977560
 - !ruby/object:Gem::Dependency
-  name: sane
-  requirement: &10321300 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &15977140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10321300
+  version_requirements: *15977140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10320740 !ruby/object:Gem::Requirement
+  requirement: &15976720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10320740
+  version_requirements: *15976720
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &10320160 !ruby/object:Gem::Requirement
+  requirement: &15976300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10320160
+  version_requirements: *15976300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &10319420 !ruby/object:Gem::Requirement
+  requirement: &15975880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10319420
+  version_requirements: *15975880
 description: Easily deploy your Rails app to RailsHoster.com by using this gem.
 email:
 - fischer@enterprise-rails.de
@@ -203,18 +203,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 196242856175491776
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 196242856175491776
 requirements: []
 rubyforge_project: railshoster
 rubygems_version: 1.8.10