railsthemes 1.0.3 → 1.0.4

data/Gemfile

@@ -7,6 +7,8 @@ gem 'rest-client'
 
 group :development do
   gem 'gem-release'
+  gem 'guard'
+  gem 'guard-rspec'
 end
 
 # development gems
@@ -14,6 +16,6 @@ group :test do
   gem 'rspec'
   gem 'rr'
   gem 'autotest'
-  gem 'fakefs', :require => 'fakefs/safe'
+  gem 'fakefs', :require => 'fakefs/safe', :git => 'https://github.com/defunkt/fakefs'
   gem 'fakeweb'
 end

data/Guardfile

@@ -0,0 +1,19 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
+

data/README.md

@@ -20,16 +20,20 @@ This has been tested with Ruby 1.8.7, and should work with higher versions. 1.8.
 
 Not sure if this will work for Windows users due to invoking tar on the command-line instead of using native Ruby. This is something that we can change going forward, just a matter of time.
 
-## Developer notes
+## Committer notes
 
-To cut a release, I've been using the gem-release gem:
+To cut a release, use the gem-release gem:
 
     installer> gem bump --version patch
 
-    inspect the commit created
+    Inspect the commit created. This is the last chance before pushing to the repo.
 
     installer> gem tag
 
+    Inspect the tag created, if you wish.
+
+    installer> gem release
+
 Changing patch to minor or major as useful. For more thorough documentation, see [gem-release](https://github.com/svenfuchs/gem-release).
 
 ## Contributing

data/bin/railsthemes

@@ -5,18 +5,26 @@ require "railsthemes"
 
 class Installer < Thor
   desc "install CODE", "Install from RailsThemes.com using your download code"
-  method_option :file, :aliases => "-f", :desc => "Use local filename instead of downloading", :type => :boolean
+  method_option :file,
+    :desc => "Use local filename instead of downloading.",
+    :type => :boolean
+  method_option :no_doc_popup,
+    :desc => "Do not pop up documentation on successful install.",
+    :aliases => "--no-doc-popup",
+    :type => :boolean
 
   def install code_or_file
+    installer = Railsthemes::Installer.new
+    installer.doc_popup = !options[:no_doc_popup]
     if options[:file]
       file = code_or_file
       abort 'Please specify a file to install from' unless file
       puts "Installing from file: #{file}."
-      Railsthemes::Installer.new.install_from_file_system file
+      installer.install_from_file_system file
     else
       code = code_or_file
       abort 'Please specify a code to install from' unless code
-      Railsthemes::Installer.new.download_from_code code
+      installer.download_from_code code
     end
   end
 

data/lib/railsthemes/installer.rb

@@ -20,6 +20,11 @@ module Railsthemes
       @logger.formatter = proc do |severity, datetime, progname, msg|
         "#{msg}\n"
       end
+      @doc_popup = true
+    end
+
+    def doc_popup= doc_popup
+      @doc_popup = doc_popup
     end
 
     def ensure_in_rails_root
@@ -33,13 +38,28 @@ module Railsthemes
         ensure_in_rails_root
 
         @logger.info 'Installing...'
-        FileUtils.cp_r(File.join(source_filepath, 'base', '.'), '.')
-        gemfile_contents = File.read('Gemfile.lock')
-        install_gems_from(source_filepath, gems_used(File.read('Gemfile.lock')) - ['haml', 'sass'])
+
+        # this file causes issues when HAML is also present, and we overwrite
+        # it in the ERB case, so safe to delete here
+        Utils.remove_file('app/views/layouts/application.html.erb')
+
+        Dir["#{source_filepath}/base/**/*"].each do |src|
+          dest = src.sub("#{source_filepath}/base/", '')
+          if File.directory?(src)
+            FileUtils.mkdir_p(dest)
+          else
+            unless dest =~ /railsthemes_.*_overrides\.*/ && File.exists?(dest)
+              FileUtils.cp(src, dest)
+            end
+          end
+        end
+        gem_names = gemspecs(Utils.read_file('Gemfile.lock')).map(&:name) - ['haml', 'sass']
+        install_gems_from(source_filepath, gem_names)
 
         @logger.info 'Done installing.'
         post_copying_changes
         print_post_installation_instructions
+        popup_documentation if @doc_popup
       elsif archive?(source_filepath)
         if File.exists?(source_filepath)
           install_from_archive source_filepath
@@ -53,6 +73,11 @@ module Railsthemes
       end
     end
 
+    def popup_documentation
+      style_guide = Dir['doc/*Usage_And_Style_Guide.html'].first
+      Safe.system_call("open #{style_guide}") if style_guide
+    end
+
     def install_gems_from source_filepath, gem_names
       gems_that_we_can_install = Dir.entries("#{source_filepath}/gems").reject{|x| x == '.' || x == '..'}
       (gem_names & gems_that_we_can_install).each do |gem_name|
@@ -64,30 +89,76 @@ module Railsthemes
       @logger.info "Extracting..."
       with_tempdir do |tempdir|
         Safe.system_call untar_string(filepath, tempdir)
+        # remove any pesky hidden files that crept into the archivej
+        Dir["#{tempdir}/**/.*"].reject {|x| x =~ /\/\.\.?$/}.each do |file|
+          File.unlink(file)
+        end
         @logger.info "Finished extracting."
         install_from_file_system tempdir
       end
     end
 
     def download_from_code code
-      check_vcs_status
-      if File.exists?('Gemfile.lock')
-        @logger.info "Downloading..."
-        with_tempdir do |tempdir|
-          archive = File.join(tempdir, 'archive.tar.gz')
-          send_gemfile code
-          config = get_primary_configuration(File.read('Gemfile.lock'))
-          dl_url = get_download_url "#{@server}/download?code=#{code}&config=#{config}"
-          if dl_url
-            Utils.download_file_to dl_url, archive
-            @logger.info "Finished downloading."
-            install_from_archive archive
-          else
-            Safe.log_and_abort("We didn't understand the code you gave to download the theme (#{code})")
-          end
+      vcs_is_unclean_message = check_vcs_status
+      if vcs_is_unclean_message
+        Safe.log_and_abort vcs_is_unclean_message
+      else
+        if File.exists?('Gemfile.lock') && Gem::Version.new('3.1') <= rails_version
+          install_from_server code
+        else
+          ask_to_install_unsupported code
+        end
+      end
+    end
+
+    def install_from_server code
+      @logger.info "Downloading theme from server..."
+      with_tempdir do |tempdir|
+        archive = File.join(tempdir, 'archive.tar.gz')
+        if File.exists?('Gemfile.lock')
+          send_gemfile code # first time hitting the server
+        end
+        config = get_primary_configuration(Utils.read_file('Gemfile.lock'))
+        dl_url = get_download_url "#{@server}/download?code=#{code}&config=#{config}"
+        if dl_url
+          Utils.download_file_to dl_url, archive
+          @logger.info "Finished downloading."
+          install_from_archive archive
+        else
+          Safe.log_and_abort("We didn't recognize the code you gave to download the theme (#{code}). It should look something like your@email.com:ABCDEF.")
         end
+      end
+    end
+
+    def ask_to_install_unsupported code
+      @logger.info "WARNING\n"
+
+      if File.exists?('Gemfile.lock')
+        @logger.info <<-EOS
+Your Gemfile.lock file indicates that you are using a version of Rails that
+is not officially supported by RailsThemes.
+        EOS
+      else
+        @logger.info <<-EOS
+We could not find a Gemfile.lock file in this directory. This could indicate
+that you are not in a Rails application, or that you are not using Bundler
+(which probably means that you are using a version of Rails that is not
+officially supported by RailsThemes.)
+        EOS
+      end
+      @logger.info <<-EOS
+While Rails applications that are less than version 3.1 are not officially
+supported, you can try installing anyway, or can stop. If you cancel the
+install before downloading, we can refund your purchase. If you install,
+we cannot guarantee that RailsThemes will work for your app. You may have
+to do some custom changes, which might be as easy as copying files,
+but which may be more complicated.
+      EOS
+
+      if Safe.yes? 'Do you still wish to install the theme? [y/N]'
+        install_from_server code
       else
-        Safe.log_and_abort("We could not find your Gemfile.lock file.") unless File.exists?('Gemfile.lock')
+        Safe.log_and_abort 'Halting.'
       end
     end
 
@@ -102,44 +173,52 @@ module Railsthemes
         end
         path = server_request_url.gsub(%r{https?://[^/]+}, '')
         response = http.request_get(path)
+      rescue SocketError => e
+        Safe.log_and_abort 'We could not reach the RailsThemes server to download the theme. Please check your internet connection and try again.'
       rescue Exception => e
-        @logger.info e.message
-        @logger.info e.backtrace
+        #@logger.info e.message
+        #@logger.info e.backtrace
       end
 
       if response
         if response.code.to_s == '200'
           return response.body
         else
-          @logger.info response
-          @logger.info "Got a #{response.code} error while trying to download."
+          #@logger.info response
+          #@logger.info "Got a #{response.code} error while trying to download."
           return nil
         end
       end
     end
 
-    def gems_used
-      gems_used File.read('Gemfile.lock')
+    def gemspecs gemfile_contents = nil
+      gemfile_contents ||= Utils.read_file('Gemfile.lock')
+      return [] if gemfile_contents.strip == ''
+      lockfile = Bundler::LockfileParser.new(gemfile_contents)
+      lockfile.specs
     end
 
-    def gems_used contents
-      return [] if contents.strip == ''
-      lockfile = Bundler::LockfileParser.new(contents)
-      lockfile.specs.map(&:name)
+    def get_primary_configuration gemfile_contents
+      gem_names = gemspecs(gemfile_contents).map(&:name)
+      (gem_names.include?('haml') ? 'haml' : 'erb') + ',' +
+      (gem_names.include?('sass') ? 'scss' : 'css')
     end
 
-    def get_primary_configuration contents
-      gems = gems_used(contents)
-      to_return = []
-      to_return << (gems.include?('haml') ? 'haml' : 'erb')
-      to_return << (gems.include?('sass') ? 'scss' : 'css')
-      to_return * ','
+    def rails_version gemfile_contents = nil
+      gemfile_contents ||= Utils.read_file('Gemfile.lock')
+      specs = gemspecs(gemfile_contents)
+      rails = specs.select{ |x| x.name == 'rails' }.first
+      if rails && rails.version
+        rails.version
+      end
     end
 
     def send_gemfile code
       begin
         response = RestClient.post("#{@server}/gemfiles/parse",
           :code => code, :gemfile_lock => File.new('Gemfile.lock', 'rb'))
+      rescue SocketError => e
+        Safe.log_and_abort 'We could not reach the RailsThemes server to start your download. Please check your internet connection and try again.'
       rescue Exception => e
         @logger.info e.message
         @logger.info e.backtrace
@@ -170,11 +249,12 @@ module Railsthemes
     # for people to view the theme correctly
     def post_copying_changes
       Utils.remove_file File.join('public', 'index.html')
-      @logger.info 'Analyzing existing project structure...'
-      create_railsthemes_controller
+      create_railsthemes_demo_pages
     end
 
-    def create_railsthemes_controller
+    def create_railsthemes_demo_pages
+      @logger.info 'Creating RailsThemes demo pages...'
+
       FileUtils.mkdir_p(File.join('app', 'controllers'))
       File.open(File.join('app', 'controllers', 'railsthemes_controller.rb'), 'w') do |f|
         f.write <<-EOS
@@ -193,19 +273,27 @@ end
       end
 
       lines = []
-      if File.exists?('config/routes.rb')
-        lines = File.read('config/routes.rb').split("\n")
+      if File.exists?(File.join('config', 'routes.rb'))
+        lines = Utils.read_file('config/routes.rb').split("\n")
         last = lines.pop
-        lines << "  match 'railsthemes/landing' => 'railsthemes#landing'"
-        lines << "  match 'railsthemes/inner' => 'railsthemes#inner'"
-        lines << "  match 'railsthemes/jquery_ui' => 'railsthemes#jquery_ui'"
+        if lines.grep(/railsthemes#landing/).empty?
+          lines << "  match 'railsthemes/landing' => 'railsthemes#landing'"
+        end
+        if lines.grep(/railsthemes#inner/).empty?
+          lines << "  match 'railsthemes/inner' => 'railsthemes#inner'"
+        end
+        if lines.grep(/railsthemes#jquery_ui/).empty? 
+          lines << "  match 'railsthemes/jquery_ui' => 'railsthemes#jquery_ui'"
+        end
         lines << last
-        File.open('config/routes.rb', 'w') do |f|
+        File.open(File.join('config', 'routes.rb'), 'w') do |f|
           lines.each do |line|
             f.puts line
           end
         end
       end
+
+      @logger.info 'Done creating RailsThemes demo pages.'
     end
 
     def check_vcs_status
@@ -222,27 +310,36 @@ end
         result = Safe.system_call('svn status')
       end
       unless result.size == 0
-        Safe.log_and_abort("\n#{variety} reports that you have the following pending changes:\n#{result}Please stash or commit the changes before proceeding to ensure that you can roll back after installing if you want.")
+        return "\n#{variety} reports that you have the following pending changes:\n#{result}\nPlease roll back or commit the changes before proceeding to ensure that you can roll back after installing if you want."
       end
     end
 
     def print_post_installation_instructions
+      number = 0
       @logger.info <<-EOS
 
 Yay! Your theme is installed!
 
 =============================
 
+Documentation and help
+
+Theme documentation is located in the doc folder.
+
+There are some help articles for your perusal at http://support.railsthemes.com.
+
+
 What now?
-1) Remove or comment out your old stylesheets, as these may conflict with the new theme
-2) Ensure your new application layout file contains everything that you wanted
-   from the old one.
-3) Restart your development server if it is currently running (the asset pipeline can
-   be finnicky.)
-4) Check out the samples at:
+1) Make sure that you have the jquery-rails gem installed. All of the current
+   themes require this in your Gemfile so we can use jQuery UI.
+2) Start or restart your development server.
+3) Check out the local theme samples at:
    http://localhost:3000/railsthemes/landing
    http://localhost:3000/railsthemes/inner
-5) Let us know how it went: @railsthemes or support@railsthemes.com
+   http://localhost:3000/railsthemes/jquery_ui
+4) Ensure your new application layout file contains everything that you wanted
+   from the old one.
+5) Let us know how it went: @railsthemes or support@railsthemes.com.
       EOS
     end
 

data/lib/railsthemes/safe.rb

@@ -1,4 +1,7 @@
 require 'fileutils'
+require 'rubygems'
+require 'bundler'
+require 'thor'
 
 # a bunch of things that should never be called in testing due to side effects
 module Railsthemes
@@ -10,5 +13,9 @@ module Railsthemes
     def self.log_and_abort s
       abort s
     end
+
+    def self.yes? question, color = nil
+      Thor::Shell::Basic.new.yes? question, color
+    end
   end
 end

data/lib/railsthemes/utils.rb

@@ -17,6 +17,10 @@ module Railsthemes
       FileUtils.cp src, dest
     end
 
+    def self.read_file filepath
+      File.exists?(filepath) ? File.read(filepath) : ''
+    end
+
     # would be nice to put download status in the output (speed, progress, etc.)
     def self.download_file_to url, save_to
       File.open(save_to, "wb") do |saved_file|

data/lib/railsthemes/version.rb

@@ -1,5 +1,5 @@
 module Railsthemes
   unless defined?(Railsthemes::VERSION)
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/lib/railsthemes/installer_spec.rb

@@ -8,6 +8,14 @@ describe Railsthemes::Installer do
       "\nGEM\n  remote: https://rubygems.org/"
   end
 
+  def using_gem_specs specs = {}
+    lines = []
+    specs.each { |name, version| lines << "    #{name} (#{version})"}
+    "GEM\nremote: https://rubygems.org/\nspecs:\n" +
+      lines.join("\n") +
+      "\nGEM\n  remote: https://rubygems.org/"
+  end
+
   before do
     @logger = Logger.new(File.join Dir.tmpdir, 'railsthemes.log')
     @installer = Railsthemes::Installer.new @logger
@@ -31,6 +39,35 @@ describe Railsthemes::Installer do
       end
     end
 
+    describe 'override file behavior' do
+      before do
+        FileUtils.mkdir_p('filepath/gems')
+        FileUtils.mkdir_p('filepath/base/app/assets/stylesheets')
+        FileUtils.mkdir_p("app/assets/stylesheets")
+        @filename = 'app/assets/stylesheets/railsthemes_THEME_overrides.anything'
+        FileUtils.touch("filepath/base/#{@filename}")
+        mock(@installer).post_copying_changes
+        stub(@installer).popup_documentation
+      end
+
+      it 'should not overwrite override files when they already exist' do
+        File.open(@filename, 'w') do |f|
+          f.write "existing override"
+        end
+
+        @installer.install_from_file_system('filepath')
+        File.exists?(@filename).should be_true
+        File.read(@filename).should =~ /existing override/
+      end
+
+      it 'should create override files when they do not already exist' do
+        @installer.install_from_file_system('filepath')
+        File.exists?(@filename).should be_true
+        File.read(@filename).should == ''
+      end
+    end
+
+
     context 'when the filepath is an archive file' do
       it 'should extract the archive file to a temp directory if the archive exists' do
         archive = 'tarfile.tar.gz'
@@ -51,6 +88,28 @@ describe Railsthemes::Installer do
         @installer.install_from_file_system("does not exist")
       end
     end
+
+    describe 'popping up the documentation on a successful install' do
+      before do
+        # set up files for copying
+        FileUtils.mkdir_p('filepath/base')
+        FileUtils.touch('filepath/base/a')
+        FileUtils.touch('filepath/base/b')
+        FileUtils.mkdir_p('filepath/gems')
+        mock(@installer).post_copying_changes
+      end
+
+      it 'should not pop it up when the user specified not to pop it up' do
+        @installer.doc_popup = false
+        dont_allow(@installer).popup_documentation
+        @installer.install_from_file_system 'filepath'
+      end
+
+      it 'should pop it up when the user did not specify to not pop it up' do
+        mock(@installer).popup_documentation
+        @installer.install_from_file_system 'filepath'
+      end
+    end
   end
 
   describe :install_gems_from do
@@ -146,18 +205,52 @@ describe Railsthemes::Installer do
     end
   end
 
+  describe :ask_to_install_unsupported do
+    it 'should abort if the user does not want to continue' do
+      mock(Railsthemes::Safe).yes?(/wish to install/) { false }
+      mock(Railsthemes::Safe).log_and_abort('Halting.')
+      @installer.ask_to_install_unsupported 'code'
+    end
+
+    it 'should continue if the user wants to continue' do
+      mock(Railsthemes::Safe).yes?(/wish to install/) { true }
+      mock(@installer).install_from_server('code')
+      @installer.ask_to_install_unsupported 'code'
+    end
+  end
+
   describe :download_from_code do
-    context 'when a gemfile.lock is not present' do
-      it 'should fail with a good message' do
-        File.unlink('Gemfile.lock')
-        mock(Railsthemes::Safe).log_and_abort(/could not find/)
-        @installer.download_from_code 'anything'
-      end
+    it 'should abort if the VCS is not clean' do
+      mock(@installer).check_vcs_status { 'msg' }
+      mock(Railsthemes::Safe).log_and_abort('msg')
+      @installer.download_from_code 'thecode'
+    end
+
+    it 'should ask the user if they still want to install when a Gemfile.lock is not present' do
+      File.unlink('Gemfile.lock')
+      mock(@installer).check_vcs_status { nil }
+      mock(@installer).ask_to_install_unsupported 'thecode'
+      @installer.download_from_code 'thecode'
+    end
+
+    it 'should ask the user if they still want to install when the rails version is < 3.1' do
+      mock(@installer).check_vcs_status { nil }
+      mock(@installer).rails_version { Gem::Version.new('3.0.9') }
+      mock(@installer).ask_to_install_unsupported 'thecode'
+      @installer.download_from_code 'thecode'
+    end
+
+    it 'should install from the server otherwise' do
+      mock(@installer).check_vcs_status { nil }
+      mock(@installer).rails_version { Gem::Version.new('3.1.0') }
+      mock(@installer).install_from_server 'thecode'
+      @installer.download_from_code 'thecode'
     end
+  end
 
+  describe '#install_from_server' do
     context 'when a gemfile.lock is present' do
       before do
-        mock(@installer).check_vcs_status
         mock(@installer).send_gemfile('panozzaj@gmail.com:code')
       end
 
@@ -168,7 +261,7 @@ describe Railsthemes::Installer do
         mock(@installer).get_primary_configuration('') { 'haml,scss' }
         mock(Railsthemes::Utils).download_file_to('auth_url', '/tmp/archive.tar.gz')
         mock(@installer).install_from_archive '/tmp/archive.tar.gz'
-        @installer.download_from_code 'panozzaj@gmail.com:code'
+        @installer.install_from_server 'panozzaj@gmail.com:code'
       end
 
       it 'should fail with an error message on any error message' do
@@ -176,13 +269,17 @@ describe Railsthemes::Installer do
           'https://railsthemes.com/download?code=panozzaj@gmail.com:code&config=',
           :body => '', :status => ['401', 'Unauthorized']
         mock(@installer).get_primary_configuration('') { '' }
-        mock(Railsthemes::Safe).log_and_abort(/didn't understand/)
-        @installer.download_from_code 'panozzaj@gmail.com:code'
+        mock(Railsthemes::Safe).log_and_abort(/didn't recognize/)
+        @installer.install_from_server 'panozzaj@gmail.com:code'
       end
     end
   end
 
   describe '#get_primary_configuration' do
+    it 'should give erb,css when there is no Gemfile' do
+      @installer.get_primary_configuration('').should == 'erb,css'
+    end
+
     it 'should give haml,scss when haml and sass are in the Gemfile' do
       gemfile = using_gems 'haml', 'sass'
       @installer.get_primary_configuration(gemfile).should == 'haml,scss'
@@ -205,55 +302,116 @@ describe Railsthemes::Installer do
   end
 
   describe :check_vcs_status do
-    context 'when git used' do
+    context 'when Git used' do
       before do
         Dir.mkdir('.git')
       end
 
-      it 'should exit when the vcs is unclean' do
+      it 'should return false, issues when the vcs is unclean' do
         mock(Railsthemes::Safe).system_call('git status -s') { '# modified: installer_spec.rb' }
-        mock(Railsthemes::Safe).log_and_abort(/pending changes/)
-        @installer.check_vcs_status
+        result = @installer.check_vcs_status
+        result.should match /Git reports/
+        result.should match /# modified: installer_spec\.rb/
+        result.should match /roll back or commit/
       end
 
       it 'should do nothing significant when the vcs is clean' do
         mock(Railsthemes::Safe).system_call('git status -s') { '' }
-        @installer.check_vcs_status
+        @installer.check_vcs_status.should be_nil
       end
     end
 
-    context 'when hg used' do
+    context 'when Mercurial used' do
       before do
         Dir.mkdir('.hg')
       end
 
       it 'should exit when the vcs is unclean' do
         mock(Railsthemes::Safe).system_call('hg status') { '? test.txt' }
-        mock(Railsthemes::Safe).log_and_abort(/pending changes/)
-        @installer.check_vcs_status
+        result = @installer.check_vcs_status
+        result.should_not be_nil
+        result.should match /Mercurial reports/
+        result.should match /\? test\.txt/
+        result.should match /roll back or commit/
       end
 
       it 'should do nothing significant when the vcs is clean' do
         mock(Railsthemes::Safe).system_call('hg status') { '' }
-        @installer.check_vcs_status
+        @installer.check_vcs_status.should be_nil
       end
     end
 
-    context 'when subversion used' do
+    context 'when Subversion used' do
       before do
         Dir.mkdir('.svn')
       end
 
       it 'should exit when the vcs is unclean' do
         mock(Railsthemes::Safe).system_call('svn status') { 'M something.txt' }
-        mock(Railsthemes::Safe).log_and_abort(/pending changes/)
-        @installer.check_vcs_status
+        result = @installer.check_vcs_status
+        result.should match /Subversion reports/
+        result.should match /M something\.txt/
+        result.should match /roll back or commit/
       end
 
       it 'should do nothing significant when the vcs is clean' do
         mock(Railsthemes::Safe).system_call('svn status') { '' }
-        @installer.check_vcs_status
+        @installer.check_vcs_status.should be_nil
+      end
+    end
+  end
+
+  describe '#create_railsthemes_demo_pages' do
+    before do
+      FileUtils.mkdir('config')
+      File.open(File.join('config', 'routes.rb'), 'w') do |f|
+        f.write <<-EOS
+RailsApp::Application.routes.draw do
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+end
+        EOS
       end
     end
+
+    it 'should create a RailsThemes controller' do
+      @installer.create_railsthemes_demo_pages
+      controller = File.join('app', 'controllers', 'railsthemes_controller.rb')
+      lines = File.read(controller).split("\n")
+      lines.count.should == 11
+      lines.first.should match /class RailsthemesController < ApplicationController/
+    end
+
+    it 'should insert lines into the routes file' do
+      @installer.create_railsthemes_demo_pages
+      routes_file = File.join('config', 'routes.rb')
+      lines = File.read(routes_file).split("\n")
+      lines.grep(/match 'railsthemes\/landing' => 'railsthemes#landing'/).count.should == 1
+      lines.grep(/match 'railsthemes\/inner' => 'railsthemes#inner'/).count.should == 1
+      lines.grep(/match 'railsthemes\/jquery_ui' => 'railsthemes#jquery_ui'/).count.should == 1
+    end
+
+    it 'should not insert lines into the routes file when run more than once' do
+      @installer.create_railsthemes_demo_pages
+      @installer.create_railsthemes_demo_pages
+      routes_file = File.join('config', 'routes.rb')
+      lines = File.read(routes_file).split("\n")
+      lines.grep(/match 'railsthemes\/landing' => 'railsthemes#landing'/).count.should == 1
+      lines.grep(/match 'railsthemes\/inner' => 'railsthemes#inner'/).count.should == 1
+      lines.grep(/match 'railsthemes\/jquery_ui' => 'railsthemes#jquery_ui'/).count.should == 1
+    end
+  end
+
+  describe '#rails_version' do
+    it 'should return the right version' do
+      gemfile = using_gem_specs :rails => '3.0.1'
+      @installer.rails_version(gemfile).version.should == '3.0.1'
+    end
+
+    it 'should return nil if there is no rails present' do
+      gemfile = using_gem_specs
+      @installer.rails_version(gemfile).should be_nil
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,16 @@ require 'fakeweb'
 RSpec.configure do |config|
   config.mock_with :rr
   config.include FakeFS::SpecHelpers
+
+  # RSpec automatically cleans stuff out of backtraces;
+  # sometimes this is annoying when trying to debug something e.g. a gem
+  #config.backtrace_clean_patterns = [
+  #  /\/lib\d*\/ruby\//,
+  #  /bin\//,
+  #  /gems/,
+  #  /spec\/spec_helper\.rb/,
+  #  /lib\/rspec\/(core|expectations|matchers|mocks)/
+  #]
 end
 
 FakeWeb.allow_net_connect = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railsthemes
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Railsthemes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 Z
+date: 2012-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -59,6 +59,7 @@ files:
 - .rspec
 - .rvmrc
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile