railsthemes 1.0.4 → 1.1.pre

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+railsthemes.log

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 gem 'thor'
 gem 'rest-client'
+gem 'launchy'
 
 group :development do
   gem 'gem-release'
@@ -16,6 +17,6 @@ group :test do
   gem 'rspec'
   gem 'rr'
   gem 'autotest'
-  gem 'fakefs', :require => 'fakefs/safe', :git => 'https://github.com/defunkt/fakefs'
+  gem 'fakefs', :require => 'fakefs/safe', :git => 'https://github.com/RailsThemes/fakefs.git'
   gem 'fakeweb'
 end

data/bin/railsthemes

@@ -10,12 +10,22 @@ class Installer < Thor
     :type => :boolean
   method_option :no_doc_popup,
     :desc => "Do not pop up documentation on successful install.",
-    :aliases => "--no-doc-popup",
+    :type => :boolean
+  method_option :verbose,
+    :desc => "Print more output on installation.",
+    :type => :boolean
+  # do not rename to :debug, conflicts with Thor built-in functionality
+  method_option :debugging,
+    :desc => "Print gratuitous output on installation (for debugging).",
     :type => :boolean
 
   def install code_or_file
+    # might be better to pass in the options directly if we get more options
     installer = Railsthemes::Installer.new
     installer.doc_popup = !options[:no_doc_popup]
+    installer.verbose if options[:verbose]
+    installer.debug if options[:debugging]
+
     if options[:file]
       file = code_or_file
       abort 'Please specify a file to install from' unless file

data/lib/railsthemes/installer.rb

@@ -6,20 +6,24 @@ require 'tmpdir'
 require 'bundler'
 require 'net/http'
 require 'rest-client'
+require 'launchy'
 
 module Railsthemes
   class Installer
     def initialize logger = nil
       @logger = logger
-      @server = 'https://railsthemes.com'
-      if File.exist?('railsthemes_server')
-        @server = File.read('railsthemes_server').gsub("\n", '')
-      end
       @logger ||= Logger.new(STDOUT)
+
       # just print out basic information, not all of the extra logger stuff
       @logger.formatter = proc do |severity, datetime, progname, msg|
         "#{msg}\n"
       end
+
+      @server = 'https://railsthemes.com'
+      if File.exist?('railsthemes_server')
+        @server = File.read('railsthemes_server').gsub("\n", '')
+      end
+
       @doc_popup = true
     end
 
@@ -27,36 +31,56 @@ module Railsthemes
       @doc_popup = doc_popup
     end
 
+    def verbose
+      @logger.level = Logger::INFO
+      @logger.info 'In verbose mode.'
+    end
+
+    def debug
+      @logger.level = Logger::DEBUG
+      @logger.debug 'In debug mode.'
+    end
+
     def ensure_in_rails_root
       unless File.directory?('app') && File.directory?('public')
         Safe.log_and_abort 'Must be in the Rails root directory to use this gem.'
       end
     end
 
-    def install_from_file_system source_filepath
+    def install_from_file_system original_source_filepath
+      source_filepath = original_source_filepath.gsub(/\\/, '/')
       if File.directory?(source_filepath)
         ensure_in_rails_root
 
-        @logger.info 'Installing...'
+        @logger.warn 'Installing...'
 
         # this file causes issues when HAML is also present, and we overwrite
         # it in the ERB case, so safe to delete here
+        @logger.debug 'removing file app/views/layouts/application.html.erb'
         Utils.remove_file('app/views/layouts/application.html.erb')
 
+        @logger.debug "source_filepath: #{source_filepath}"
         Dir["#{source_filepath}/base/**/*"].each do |src|
+          @logger.debug "src: #{src}"
           dest = src.sub("#{source_filepath}/base/", '')
+          @logger.debug "dest: #{dest}"
           if File.directory?(src)
+            @logger.debug "mkdir -p #{dest}"
             FileUtils.mkdir_p(dest)
           else
-            unless dest =~ /railsthemes_.*_overrides\.*/ && File.exists?(dest)
+            unless (dest =~ /railsthemes_.*_overrides\.*/ && File.exists?(dest)) ||
+                src =~ /\/\./ # remove any pesky hidden files that crept into the archive
+              @logger.debug "cp #{src} #{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.'
+        @logger.warn 'Done installing.'
+
         post_copying_changes
         print_post_installation_instructions
         popup_documentation if @doc_popup
@@ -75,25 +99,29 @@ module Railsthemes
 
     def popup_documentation
       style_guide = Dir['doc/*Usage_And_Style_Guide.html'].first
-      Safe.system_call("open #{style_guide}") if style_guide
+      @logger.debug("style_guide: #{style_guide}")
+      Launchy.open(style_guide) if style_guide
     end
 
     def install_gems_from source_filepath, gem_names
+      return unless File.directory?("#{source_filepath}/gems")
+      @logger.debug "gem_names: #{gem_names * ' '}"
       gems_that_we_can_install = Dir.entries("#{source_filepath}/gems").reject{|x| x == '.' || x == '..'}
+      @logger.debug "gems_that_we_can_install: #{gems_that_we_can_install * ' '}"
       (gem_names & gems_that_we_can_install).each do |gem_name|
-        FileUtils.cp_r(File.join(source_filepath, 'gems', gem_name, '.'), '.')
+        src = File.join(source_filepath, 'gems', gem_name, '.')
+        @logger.debug("copying gems from #{src}")
+        FileUtils.cp_r(src, '.')
       end
     end
 
     def install_from_archive filepath
-      @logger.info "Extracting..."
+      @logger.warn "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."
+        io = Tar.ungzip(File.open(filepath, 'rb'))
+        Tar.untar(io, tempdir)
+
+        @logger.warn "Finished extracting."
         install_from_file_system tempdir
       end
     end
@@ -103,16 +131,51 @@ module Railsthemes
       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
+        version_is_bad_message = check_installer_version
+        if version_is_bad_message
+          Safe.log_and_abort version_is_bad_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
+    end
+
+    def check_installer_version
+      begin
+        response = Utils.get_url(@server + '/installer/version')
+      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 * "\n"
+      end
+
+      if response && response.code.to_s == '200'
+        server_recommended_version_string = response.body
+        server_recommended_version = Gem::Version.new(server_recommended_version_string)
+        local_installer_version = Gem::Version.new(Railsthemes::VERSION)
+
+        if server_recommended_version > local_installer_version
+          <<-EOS
+          Your version is older than the recommended version.
+          Your version: #{Railsthemes::VERSION}
+          Recommended version: #{server_recommended_version_string}
+          EOS
         else
-          ask_to_install_unsupported code
+          @logger.debug "server recommended version: #{server_recommended_version_string}"
+          nil
         end
+      else
+        'There was an issue checking your installer version.'
       end
     end
 
     def install_from_server code
-      @logger.info "Downloading theme from server..."
+      @logger.warn "Downloading theme from server..."
       with_tempdir do |tempdir|
         archive = File.join(tempdir, 'archive.tar.gz')
         if File.exists?('Gemfile.lock')
@@ -122,7 +185,7 @@ module Railsthemes
         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."
+          @logger.warn "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.")
@@ -131,22 +194,22 @@ module Railsthemes
     end
 
     def ask_to_install_unsupported code
-      @logger.info "WARNING\n"
+      @logger.warn "WARNING\n"
 
       if File.exists?('Gemfile.lock')
-        @logger.info <<-EOS
+        @logger.warn <<-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
+        @logger.warn <<-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
+      @logger.warn <<-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,
@@ -165,29 +228,18 @@ but which may be more complicated.
     def get_download_url server_request_url
       response = nil
       begin
-        url = URI.parse(server_request_url)
-        http = Net::HTTP.new url.host, url.port
-        if server_request_url =~ /^https/
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        end
-        path = server_request_url.gsub(%r{https?://[^/]+}, '')
-        response = http.request_get(path)
+        response = Utils.get_url server_request_url
       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."
-          return nil
-        end
+      if response && response.code.to_s == '200'
+        response.body
+      else
+        nil
       end
     end
 
@@ -208,9 +260,7 @@ but which may be more complicated.
       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
+      rails.version if rails && rails.version
     end
 
     def send_gemfile code
@@ -233,29 +283,29 @@ but which may be more complicated.
     end
 
     def generate_tempdir_name
-      File.join(Dir.tmpdir, DateTime.now.strftime("railsthemes-%Y%m%d-%H%M%S-#{rand(100000000)}"))
+      tempdir = File.join(Dir.tmpdir, DateTime.now.strftime("railsthemes-%Y%m%d-%H%M%S-#{rand(100000000)}"))
+      @logger.debug "tempdir: #{tempdir}"
+      tempdir
     end
 
     def archive? filepath
       filepath =~ /\.tar\.gz$/
     end
 
-    def untar_string filepath, newdirpath
-      "tar -zxf #{filepath} -C #{newdirpath}"
-    end
-
-
     # this happens after a successful copy so that we set up the environment correctly
     # for people to view the theme correctly
     def post_copying_changes
+      @logger.info "Removing public/index.html"
       Utils.remove_file File.join('public', 'index.html')
       create_railsthemes_demo_pages
     end
 
     def create_railsthemes_demo_pages
-      @logger.info 'Creating RailsThemes demo pages...'
+      @logger.warn 'Creating RailsThemes demo pages...'
 
+      @logger.debug "mkdir -p app/controllers"
       FileUtils.mkdir_p(File.join('app', 'controllers'))
+      @logger.debug "writing to app/controllers/railsthemes_controller.rb"
       File.open(File.join('app', 'controllers', 'railsthemes_controller.rb'), 'w') do |f|
         f.write <<-EOS
 class RailsthemesController < ApplicationController
@@ -293,7 +343,7 @@ end
         end
       end
 
-      @logger.info 'Done creating RailsThemes demo pages.'
+      @logger.warn 'Done creating RailsThemes demo pages.'
     end
 
     def check_vcs_status
@@ -316,7 +366,7 @@ end
 
     def print_post_installation_instructions
       number = 0
-      @logger.info <<-EOS
+      @logger.warn <<-EOS
 
 Yay! Your theme is installed!
 

data/lib/railsthemes/os.rb

@@ -0,0 +1,17 @@
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.mac?
+   (/darwin/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.unix?
+    !OS.windows?
+  end
+
+  def OS.linux?
+    OS.unix? and not OS.mac?
+  end
+end

data/lib/railsthemes/tar.rb

@@ -0,0 +1,89 @@
+# lifted from https://gist.github.com/1335041
+require 'rubygems'
+require 'rubygems/package'
+require 'zlib'
+require 'fileutils'
+
+module Railsthemes
+  class Tar
+    # Creates a tar file in memory recursively
+    # from the given path.
+    #
+    # Returns a StringIO whose underlying String
+    # is the contents of the tar file.
+    def self.tar(path)
+      tarfile = StringIO.new("")
+      Gem::Package::TarWriter.new(tarfile) do |tar|
+        Dir[File.join(path, "**/*")].each do |file|
+          mode = File.stat(file).mode
+          relative_file = file.sub /^#{Regexp::escape path}\/?/, ''
+
+          if File.directory?(file)
+            tar.mkdir relative_file, mode
+          else
+            tar.add_file relative_file, mode do |tf|
+              File.open(file, "rb") { |f| tf.write f.read }
+            end
+          end
+        end
+      end
+
+      tarfile.rewind
+      tarfile
+    end
+
+    # gzips the underlying string in the given StringIO,
+    # returning a new StringIO representing the 
+    # compressed file.
+    def self.gzip(tarfile)
+      gz = StringIO.new("")
+      z = Zlib::GzipWriter.new(gz)
+      z.write tarfile.string
+      z.close # this is necessary!
+
+      # z was closed to write the gzip footer, so
+      # now we need a new StringIO
+      StringIO.new gz.string
+    end
+
+    # un-gzips the given IO, returning the
+    # decompressed version as a StringIO
+    def self.ungzip(tarfile)
+      z = Zlib::GzipReader.new(tarfile)
+      unzipped = StringIO.new(z.read)
+      z.close
+      unzipped
+    end
+
+    # untars the given IO into the specified
+    # directory
+    def self.untar(io, destination)
+      Gem::Package::TarReader.new io do |tar|
+        tar.each do |tarfile|
+          destination_file = File.join destination, tarfile.full_name
+
+          if tarfile.directory?
+            FileUtils.mkdir_p destination_file
+          else
+            destination_directory = File.dirname(destination_file)
+            FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
+            File.open destination_file, "wb" do |f|
+              f.print tarfile.read
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+
+### Usage Example: ###
+#
+# include Util::Tar
+#
+# io = tar("./Desktop")   # io is a TAR of files
+# gz = gzip(io)           # gz is a TGZ
+#
+# io = ungzip(gz)         # io is a TAR
+# untar(io, "./untarred") # files are untarred

data/lib/railsthemes/utils.rb

@@ -1,9 +1,12 @@
 require 'fileutils'
 require 'open-uri'
+require 'railsthemes/os'
 
 # a bunch of things that should never be called in testing due to side effects
 module Railsthemes
   class Utils
+    @@https_seen_before = false
+
     # remove file only if it exists
     def self.remove_file filepath
       if File.exists?(filepath)
@@ -30,5 +33,23 @@ module Railsthemes
         end
       end
     end
+
+    def self.get_url server_request_url
+      url = URI.parse(server_request_url)
+      http = Net::HTTP.new url.host, url.port
+      if server_request_url =~ /^https/
+        if ::OS.windows?
+          unless @@https_seen_before
+            Railsthemes::WinCacerts.fetch
+            @@https_seen_before = true
+          end
+          http.ca_file = 'C:/RailsInstaller/cacert.pem'
+        end
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+      path = server_request_url.gsub(%r{https?://[^/]+}, '')
+      http.request_get(path)
+    end
   end
 end

data/lib/railsthemes/version.rb

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

data/lib/railsthemes/win_cacerts.rb

@@ -0,0 +1,26 @@
+# This is required on Windows to get around an issue where SSL certificates
+# are not loaded properly on default
+#
+# originally from https://raw.github.com/gist/867550/win_fetch_cacerts.rb, from
+# https://gist.github.com/867550
+
+require 'net/http'
+
+module Railsthemes
+  class WinCacerts
+    def self.fetch
+      # create a path to the file "C:\RailsInstaller\cacert.pem"
+      cacert_file = File.join(%w{c: RailsInstaller cacert.pem})
+
+      Net::HTTP.start("curl.haxx.se") do |http|
+        resp = http.get("/ca/cacert.pem")
+        if resp.code == "200"
+          open(cacert_file, "wb") { |file| file.write(resp.body) }
+          ENV['SSL_CERT_FILE']  = 'C:\RailsInstaller\cacert.pem'
+        else
+          Railsthemes::Safe.log_and_abort "A cacert.pem bundle could not be downloaded."
+        end
+      end
+    end
+  end
+end

data/lib/railsthemes.rb

@@ -1,7 +1,9 @@
 require 'railsthemes/version'
 require 'railsthemes/safe'
 require 'railsthemes/utils'
+require 'railsthemes/tar'
 require 'railsthemes/installer'
+require 'railsthemes/win_cacerts'
 
 module Railsthemes
 end

data/spec/lib/railsthemes/installer_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'railsthemes'
+require 'railsthemes/os'
 
 describe Railsthemes::Installer do
   def using_gems *gems
@@ -16,11 +17,25 @@ describe Railsthemes::Installer do
       "\nGEM\n  remote: https://rubygems.org/"
   end
 
+  LOGFILE_NAME = 'railsthemes.log'
+
+  before :all do
+    File.delete(LOGFILE_NAME) if File.exists?(LOGFILE_NAME)
+  end
+
   before do
-    @logger = Logger.new(File.join Dir.tmpdir, 'railsthemes.log')
+    @logger = Logger.new(LOGFILE_NAME)
+    @logger.info "#{self.example.description}"
     @installer = Railsthemes::Installer.new @logger
     stub(@installer).ensure_in_rails_root
-    stub(@installer).generate_tempdir_name { '/tmp' }
+    FakeWeb.register_uri(:get, "http://curl.haxx.se/ca/cacert.pem", :body => "CAs")
+    @tempdir = ''
+    if OS.windows?
+      @tempdir = File.join('C:', 'Users', 'Admin', 'AppData', 'Local', 'Temp')
+    else
+      @tempdir = 'tmp'
+    end
+    stub(@installer).generate_tempdir_name { @tempdir }
     FileUtils.touch('Gemfile.lock')
   end
 
@@ -30,12 +45,43 @@ describe Railsthemes::Installer do
         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
 
         @installer.install_from_file_system('filepath')
-        File.exists?('a').should be_true
-        File.exists?('b').should be_true
+        File.should exist('a')
+        File.should exist('b')
+      end
+
+      it 'should handle directories that have spaces' do
+        FileUtils.mkdir_p('file path/base')
+        FileUtils.touch('file path/base/a')
+        FileUtils.touch('file path/base/b')
+        mock(@installer).post_copying_changes
+
+        @installer.install_from_file_system('file path')
+        File.should exist('a')
+        File.should exist('b')
+      end
+
+      it 'should handle windows style paths' do
+        FileUtils.mkdir_p('fp1/fp2/base')
+        FileUtils.touch('fp1/fp2/base/a')
+        FileUtils.touch('fp1/fp2/base/b')
+        FileUtils.mkdir_p('fp1/fp2/gems')
+        mock(@installer).post_copying_changes
+
+        @installer.install_from_file_system('fp1\fp2')
+        File.should exist('a')
+        File.should exist('b')
+      end
+
+      it 'should not copy system files' do
+        FileUtils.mkdir_p('filepath/base')
+        FileUtils.touch('filepath/base/.DS_Store')
+        mock(@installer).post_copying_changes
+
+        @installer.install_from_file_system('filepath')
+        File.should_not exist('.DS_Store')
       end
     end
 
@@ -56,13 +102,13 @@ describe Railsthemes::Installer do
         end
 
         @installer.install_from_file_system('filepath')
-        File.exists?(@filename).should be_true
+        File.should exist(@filename)
         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.should exist(@filename)
         File.read(@filename).should == ''
       end
     end
@@ -114,27 +160,22 @@ describe Railsthemes::Installer do
 
   describe :install_gems_from do
     it 'should install the gems that we specify that match' do
-      FakeFS::FileSystem.clone('spec/fixtures')
+      FakeFS::FileSystem.clone('spec/fixtures/blank-assets')
+      # we only know about formtastic and simple_form in the gems directory
       @installer.install_gems_from("spec/fixtures/blank-assets", ['formtastic', 'kaminari'])
-      File.exist?(File.join('app', 'assets', 'stylesheets', 'formtastic.css.scss')).should be_true
-      File.exist?(File.join('app', 'assets', 'stylesheets', 'kaminari.css.scss')).should be_false
-      File.exist?(File.join('app', 'assets', 'stylesheets', 'simple_form.css.scss')).should be_false
+      File.should exist('app/assets/stylesheets/formtastic.css.scss')
+      File.should_not exist('app/assets/stylesheets/kaminari.css.scss')
+      File.should_not exist('app/assets/stylesheets/simple_form.css.scss')
     end
   end
 
   describe :install_from_archive do
-    it 'should extract the archive correctly' do
-      mock(@installer).install_from_file_system '/tmp'
-      mock(@installer).untar_string('filepath', anything) { 'untar string' }
-      mock(Railsthemes::Safe).system_call('untar string')
-      @installer.install_from_archive 'filepath'
-    end
-  end
-
-  describe :untar_string do
-    it 'should return correct value for *.tar.gz file' do
-      result = @installer.untar_string 'file.tar.gz', 'newdirpath'
-      result.should == 'tar -zxf file.tar.gz -C newdirpath'
+    # does not work on Windows, NotImplementedError in tar module
+    it 'should extract and then install from that extracted directory' do
+      filename = 'spec/fixtures/blank-assets.tar.gz'
+      FakeFS::FileSystem.clone(filename)
+      mock(@installer).install_from_file_system @tempdir
+      @installer.install_from_archive filename
     end
   end
 
@@ -158,7 +199,7 @@ describe Railsthemes::Installer do
        'app/views/layouts/_interior_sidebar.html.erb',
        'app/views/layouts/application.html.erb',
        'app/views/layouts/homepage.html.erb'].each do |filename|
-         File.exist?(filename).should be_true, "#{filename} was not present"
+         File.should exist(filename), "#{filename} was not present"
       end
       File.open('app/assets/stylesheets/style.css.erb').each do |line|
         line.should match /style.css.erb/
@@ -168,6 +209,7 @@ describe Railsthemes::Installer do
     before do
       stub(@installer).post_copying_changes
       FakeFS::FileSystem.clone('spec/fixtures')
+      # should add some gems to the gemfile here and test gem installation
     end
 
     it 'should extract correctly from directory' do
@@ -176,9 +218,11 @@ describe Railsthemes::Installer do
       verify_end_to_end_operation
     end
 
-    # TODO need to use a pure ruby solution to get this to mock in the file system right
+    # does not work on Windows, NotImplementedError in tar module
     it 'should extract correctly from archive' do
-      pending 'needs pure ruby untar solution'
+      filename = 'spec/fixtures/blank-assets.tar.gz'
+      @installer.install_from_file_system filename
+      verify_end_to_end_operation
     end
   end
 
@@ -226,28 +270,84 @@ describe Railsthemes::Installer do
       @installer.download_from_code 'thecode'
     end
 
+    it 'should abort if the installer version is not up-to-date' do
+      mock(@installer).check_vcs_status
+      mock(@installer).check_installer_version { '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).check_vcs_status
+      mock(@installer).check_installer_version
       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).check_vcs_status
+      mock(@installer).check_installer_version
       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).check_vcs_status
+      mock(@installer).check_installer_version
       mock(@installer).rails_version { Gem::Version.new('3.1.0') }
       mock(@installer).install_from_server 'thecode'
       @installer.download_from_code 'thecode'
     end
   end
 
+  def with_installer_version version, &block
+    old_version = Railsthemes::VERSION
+    Railsthemes.send(:remove_const, 'VERSION')
+    Railsthemes.const_set('VERSION', version)
+
+    block.call
+
+    Railsthemes.send(:remove_const, 'VERSION')
+    Railsthemes.const_set('VERSION', old_version)
+  end
+
+  describe '#check_installer_version' do
+    it 'should return message if the current installer version is < server recommendation' do
+      FakeWeb.register_uri :get, /\/installer\/version$/, :body => '1.0.4'
+      with_installer_version '1.0.3' do
+        result = @installer.check_installer_version
+        result.should_not be_nil
+        result.should match(/Your version is older than the recommended version/)
+        result.should match(/Your version: 1\.0\.3/)
+        result.should match(/Recommended version: 1\.0\.4/)
+      end
+    end
+
+    it 'should return nothing if the current installer version is = server recommendation' do
+      FakeWeb.register_uri :get, /\/installer\/version$/, :body => '1.0.4'
+      with_installer_version '1.0.4' do
+        result = @installer.check_installer_version
+        result.should be_nil
+      end
+    end
+
+    it 'should return nothing if the current installer version is > server recommendation' do
+      FakeWeb.register_uri :get, /\/installer\/version$/, :body => '1.0.4'
+      with_installer_version '1.0.5' do
+        result = @installer.check_installer_version
+        result.should be_nil
+      end
+    end
+
+    it 'should return an error message on any HTTP errors' do
+      FakeWeb.register_uri :get, /\/installer\/version$/,
+        :body => '', :status => ['401', 'Unauthorized']
+      @installer.check_installer_version.should_not be_nil
+    end
+  end
+
   describe '#install_from_server' do
     context 'when a gemfile.lock is present' do
       before do
@@ -259,8 +359,8 @@ describe Railsthemes::Installer do
           /download\?code=panozzaj@gmail.com:code&config=haml,scss/,
           :body => 'auth_url'
         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'
+        mock(Railsthemes::Utils).download_file_to('auth_url', "#{@tempdir}/archive.tar.gz")
+        mock(@installer).install_from_archive "#{@tempdir}/archive.tar.gz"
         @installer.install_from_server 'panozzaj@gmail.com:code'
       end
 
@@ -414,4 +514,19 @@ end
       @installer.rails_version(gemfile).should be_nil
     end
   end
+
+  describe 'popup_documentation' do
+    it 'should not open if the style guide does not exist' do
+      dont_allow(Launchy).open(anything)
+      @installer.popup_documentation
+    end
+
+    it 'should open the style guide correctly if it exists' do
+      FileUtils.mkdir_p('doc')
+      filename = 'doc/Theme_Envy_Usage_And_Style_Guide.html'
+      FileUtils.touch(filename)
+      mock(Launchy).open(filename)
+      @installer.popup_documentation
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -11,11 +11,11 @@ RSpec.configure do |config|
   # 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)/
+  ##  /\/lib\d*\/ruby\//,
+  ##  /bin\//,
+  ##  /gems/,
+  ##  /spec\/spec_helper\.rb/,
+  ##  /lib\/rspec\/(core|expectations|matchers|mocks)/
   #]
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railsthemes
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 961915928
+  prerelease: 4
   segments: 
   - 1
-  - 0
-  - 4
-  version: 1.0.4
+  - 1
+  - pre
+  version: 1.1.pre
 platform: ruby
 authors: 
 - Railsthemes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 Z
+date: 2012-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -66,10 +66,14 @@ files:
 - bin/railsthemes
 - lib/railsthemes.rb
 - lib/railsthemes/installer.rb
+- lib/railsthemes/os.rb
 - lib/railsthemes/safe.rb
+- lib/railsthemes/tar.rb
 - lib/railsthemes/utils.rb
 - lib/railsthemes/version.rb
+- lib/railsthemes/win_cacerts.rb
 - railsthemes.gemspec
+- spec/fixtures/blank-assets.tar.gz
 - spec/fixtures/blank-assets/base/app/assets/images/bg/sprite.png
 - spec/fixtures/blank-assets/base/app/assets/images/image1.png
 - spec/fixtures/blank-assets/base/app/assets/javascripts/jquery.dataTables.js
@@ -102,12 +106,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -116,6 +122,7 @@ signing_key:
 specification_version: 3
 summary: Installs gems from railsthemes.com
 test_files: 
+- spec/fixtures/blank-assets.tar.gz
 - spec/fixtures/blank-assets/base/app/assets/images/bg/sprite.png
 - spec/fixtures/blank-assets/base/app/assets/images/image1.png
 - spec/fixtures/blank-assets/base/app/assets/javascripts/jquery.dataTables.js