railsthemes 1.1.1 → 1.1.2

data/Gemfile

@@ -1,11 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'thor'
-gem 'rest-client'
-gem 'launchy'
-gem 'json'
-# make sure you add any new dependencies in railsthemes.gemspec
 
 group :development do
   gem 'gem-release'

data/lib/railsthemes/ensurer.rb

@@ -5,14 +5,14 @@ module Railsthemes
     @@already_checked = false
 
     # checks if we can cleanly install into the current working directory
-    def self.ensure_clean_install_possible force = false
-      return if @@already_checked unless force
+    def self.ensure_clean_install_possible options = {}
+      return if @@already_checked unless options[:force]
       ensure_in_rails_root
       ensure_bundle_is_up_to_date
       ensure_railsthemes_is_not_in_gemfile
       ensure_vcs_is_clean
       ensure_rails_version_is_valid
-      ensure_installer_is_up_to_date
+      ensure_installer_is_up_to_date unless options[:hit_server] == false
       @@already_checked = true
     end
 

data/lib/railsthemes/installer.rb

@@ -16,13 +16,11 @@ module Railsthemes
       # can probably just make static
       def theme_installer
         @theme_installer ||= ThemeInstaller.new
-        @theme_installer
       end
 
       # can probably just make static
       def email_installer
         @email_installer ||= EmailInstaller.new
-        @email_installer
       end
 
       def popup_documentation
@@ -34,9 +32,8 @@ module Railsthemes
         end
       end
 
-      # primary method
       def install_from_file_system original_source_filepath
-        Ensurer.ensure_clean_install_possible
+        Ensurer.ensure_clean_install_possible :hit_server => false
 
         # install main theme
         config = Utils.get_primary_configuration
@@ -60,9 +57,8 @@ module Railsthemes
         popup_documentation if @doc_popup
       end
 
-      # primary method
       def install_from_code code
-        Ensurer.ensure_clean_install_possible
+        Ensurer.ensure_clean_install_possible :hit_server => true
 
         logger.warn "Figuring out what to download..."
         send_gemfile code
@@ -70,6 +66,7 @@ module Railsthemes
         dl_hash = get_download_hash code
 
         if dl_hash
+          logger.debug "dl_hash: #{dl_hash.to_s}"
           Utils.with_tempdir do |tempdir|
             download_from_hash dl_hash, tempdir
             install_from_file_system tempdir

data/lib/railsthemes/logging.rb

@@ -6,16 +6,14 @@ module Railsthemes
     end
 
     def self.logger
-      if @logger
-        @logger
-      else
+      unless @logger
         @logger = Logger.new(STDOUT)
         @logger.level = Logger::WARN
 
         # just print out basic information, not all of the extra logger stuff
         @logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
-        @logger
       end
+      @logger
     end
 
     def self.logger= logger

data/lib/railsthemes/theme_installer.rb

@@ -41,7 +41,7 @@ module Railsthemes
               FileUtils.mkdir_p(dest)
             end
           else
-            unless (dest =~ /railsthemes_.*_overrides\.*/ && File.exists?(dest)) ||
+            unless (dest =~ /overrides\.css.*/ && File.exists?(dest)) ||
                 src =~ /\/\./ # remove any pesky hidden files that crept into the archive
               logger.debug "cp #{src} #{dest}"
               FileUtils.cp(src, dest)

data/lib/railsthemes/version.rb

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

data/lib/railsthemes.rb

@@ -19,13 +19,11 @@ require 'railsthemes/ensurer'
 
 module Railsthemes
   def self.server
-    return @server if @server
     @server ||= 'https://railsthemes.com'
-    @server
   end
 
   def self.server= server
-    @server = server
     Logging.logger.warn "Using server: #{server}"
+    @server = server
   end
 end

data/spec/lib/railsthemes/ensurer_spec.rb

@@ -24,7 +24,17 @@ describe Railsthemes::Ensurer do
       mock(Railsthemes::Ensurer).ensure_vcs_is_clean.times(2)
       mock(Railsthemes::Ensurer).ensure_rails_version_is_valid.times(2)
       mock(Railsthemes::Ensurer).ensure_installer_is_up_to_date.times(2)
-      2.times { Railsthemes::Ensurer.ensure_clean_install_possible true }
+      2.times { Railsthemes::Ensurer.ensure_clean_install_possible :force => true }
+    end
+
+    it 'should not check installer version if we do not want to hit the server' do
+      mock(Railsthemes::Ensurer).ensure_in_rails_root
+      mock(Railsthemes::Ensurer).ensure_bundle_is_up_to_date
+      mock(Railsthemes::Ensurer).ensure_railsthemes_is_not_in_gemfile
+      mock(Railsthemes::Ensurer).ensure_vcs_is_clean
+      mock(Railsthemes::Ensurer).ensure_rails_version_is_valid
+      dont_allow(Railsthemes::Ensurer).ensure_installer_is_up_to_date
+      Railsthemes::Ensurer.ensure_clean_install_possible :hit_server => false, :force => true
     end
   end
 

data/spec/lib/railsthemes/theme_installer_spec.rb

@@ -73,7 +73,7 @@ describe Railsthemes::ThemeInstaller 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'
+        @filename = 'app/assets/stylesheets/overrides.css.scss'
         FileUtils.touch("filepath/base/#{@filename}")
         mock(@installer).post_copying_changes
         stub(@installer).popup_documentation

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railsthemes
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Railsthemes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
+date: 2012-08-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor