railsthemes 1.1 → 1.1.1

data/lib/railsthemes/email_installer.rb

@@ -52,7 +52,7 @@ EOS
           'railsthemes/send_email' => 'railsthemes#send_email'
         })
 
-        Utils.conditionally_install_gems 'roadie', 'premailer-rails3'
+        install_mail_gems_if_necessary
 
         create_file File.join('config', 'initializers', 'premailer.rb'), :verbose => false do
           "PremailerRails.config.merge(:input_encoding => 'UTF-8', :generate_text_part => true)"
@@ -61,6 +61,20 @@ EOS
         logger.warn 'Done installing email theme.'
       end
 
+      def install_mail_gems_if_necessary
+        gem_names = Utils.gemspecs.map(&:name)
+        logger.debug "gem_names: #{gem_names}"
+        unless gem_names.include?('premailer-rails3')
+          if (gem_names & ['hpricot', 'nokogiri']).empty?
+            Utils.add_gem_to_gemfile 'hpricot'
+          end
+          Utils.add_gem_to_gemfile 'premailer-rails3'
+          logger.warn 'Installing assistant mail gems...'
+          Safe.system_call 'bundle'
+          logger.warn 'Done installing assistant mail gems.'
+        end
+      end
+
       def install_from_archive filepath
         Railsthemes::Utils.with_tempdir do |tempdir|
           Utils.unarchive filepath, tempdir

data/lib/railsthemes/utils.rb

@@ -1,146 +1,135 @@
 module Railsthemes
-  class Utils
-    extend Railsthemes::Logging
-
-    # remove file only if it exists
-    def self.remove_file filepath
-      if File.exists?(filepath)
-        File.delete filepath
+  class Utils < Thor
+    no_tasks do
+      extend Railsthemes::Logging
+      extend Thor::Actions
+
+      # remove file only if it exists
+      def self.remove_file filepath
+        if File.exists?(filepath)
+          File.delete filepath
+        end
       end
-    end
 
-    # copy a file, ensuring that the directory is present
-    def self.copy_ensuring_directory_exists src, dest
-      FileUtils.mkdir_p(File.dirname(dest)) # create directory if necessary
-      FileUtils.cp src, dest
-    end
+      # copy a file, ensuring that the directory is present
+      def self.copy_ensuring_directory_exists src, dest
+        FileUtils.mkdir_p(File.dirname(dest)) # create directory if necessary
+        FileUtils.cp src, dest
+      end
 
-    def self.read_file filepath
-      File.exists?(filepath) ? File.read(filepath) : ''
-    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.)
-    # needs tests
-    def self.download params = {}
-      url = params[:url]
-      save_to = params[:save_to]
-      return unless url && save_to
-      logger.info "Downloading url: #{url}"
-      logger.info "Saving to: #{save_to}"
-      uri = URI(url)
-      http = Net::HTTP.new uri.host, uri.port
-      set_https http if uri.scheme == 'https'
-      path = url.gsub(%r{https?://[^/]+}, '')
-      response = http.get(path)
-      if response.code.to_s == '200'
-        File.open(save_to, 'wb') do |file|
-          file.write(response.body)
+      # would be nice to put download status in the output (speed, progress, etc.)
+      # needs tests
+      def self.download params = {}
+        url = params[:url]
+        save_to = params[:save_to]
+        return unless url && save_to
+        logger.info "Downloading url: #{url}"
+        logger.info "Saving to: #{save_to}"
+        uri = URI(url)
+        http = Net::HTTP.new uri.host, uri.port
+        set_https http if uri.scheme == 'https'
+        path = url.gsub(%r{https?://[^/]+}, '')
+        response = http.get(path)
+        if response.code.to_s == '200'
+          File.open(save_to, 'wb') do |file|
+            file.write(response.body)
+          end
+        else
+          logger.debug "response.code: #{response.code}"
+          logger.debug "response.body: #{response.body}"
+          Safe.log_and_abort 'Had trouble downloading a file and cannot continue.'
         end
-      else
-        logger.debug "response.code: #{response.code}"
-        logger.debug "response.body: #{response.body}"
-        Safe.log_and_abort 'Had trouble downloading a file and cannot continue.'
       end
-    end
 
-    # needs tests I think
-    def self.get_url url
-      uri = URI.parse url
-      http = Net::HTTP.new uri.host, uri.port
-      set_https http if uri.scheme == 'https'
-      path = url.gsub(%r{https?://[^/]+}, '')
-      http.request_get(path)
-    end
+      # needs tests I think
+      def self.get_url url
+        uri = URI.parse url
+        http = Net::HTTP.new uri.host, uri.port
+        set_https http if uri.scheme == 'https'
+        path = url.gsub(%r{https?://[^/]+}, '')
+        http.request_get(path)
+      end
 
-    # needs tests
-    def self.set_https http
-      cacert_file = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'cacert.pem')
-      http.ca_file = cacert_file
-      http.ca_path = cacert_file
-      ENV['SSL_CERT_FILE'] = cacert_file
+      # needs tests
+      def self.set_https http
+        cacert_file = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'cacert.pem')
+        http.ca_file = cacert_file
+        http.ca_path = cacert_file
+        ENV['SSL_CERT_FILE'] = cacert_file
 
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    end
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
 
-    def self.archive? filepath
-      File.exists?(filepath) && filepath =~ /\.tar\.gz$/
-    end
+      def self.archive? filepath
+        File.exists?(filepath) && filepath =~ /\.tar\.gz$/
+      end
 
-    # needs tests
-    def self.with_tempdir &block
-      tempdir = generate_tempdir_name
-      FileUtils.mkdir_p tempdir
-      yield tempdir
-      FileUtils.rm_rf tempdir
-    end
+      # needs tests
+      def self.with_tempdir &block
+        tempdir = generate_tempdir_name
+        FileUtils.mkdir_p tempdir
+        yield tempdir
+        FileUtils.rm_rf tempdir
+      end
 
-    # needs tests
-    def self.generate_tempdir_name
-      tempdir = File.join(Dir.tmpdir, DateTime.now.strftime("railsthemes-%Y%m%d-%H%M%S-#{rand(100000000)}"))
-      logger.debug "tempdir: #{tempdir}"
-      tempdir
-    end
+      # needs tests
+      def self.generate_tempdir_name
+        tempdir = File.join(Dir.tmpdir, DateTime.now.strftime("railsthemes-%Y%m%d-%H%M%S-#{rand(100000000)}"))
+        logger.debug "tempdir: #{tempdir}"
+        tempdir
+      end
 
-    # needs tests
-    def self.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
+      # needs tests
+      def self.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 self.unarchive archive, extract_to
-      Safe.log_and_abort "Archive expected at #{archive}, but none exists." unless File.exist?(archive)
-      logger.warn "Extracting..."
-      logger.info "Attempting to extract #{archive}"
-      io = Tar.ungzip(File.open(archive, 'rb'))
-      Tar.untar(io, extract_to)
-      logger.warn "Finished extracting."
-    end
+      def self.unarchive archive, extract_to
+        Safe.log_and_abort "Archive expected at #{archive}, but none exists." unless File.exist?(archive)
+        logger.warn "Extracting..."
+        logger.info "Attempting to extract #{archive}"
+        io = Tar.ungzip(File.open(archive, 'rb'))
+        Tar.untar(io, extract_to)
+        logger.warn "Finished extracting."
+      end
 
-    def self.get_primary_configuration gemfile_contents = read_file('Gemfile.lock')
-      gem_names = gemspecs(gemfile_contents).map(&:name)
-      [(gem_names.include?('haml') ? 'haml' : 'erb'),
-       (gem_names.include?('sass') ? 'scss' : 'css')]
-    end
+      def self.get_primary_configuration gemfile_contents = read_file('Gemfile.lock')
+        gem_names = gemspecs(gemfile_contents).map(&:name)
+        [(gem_names.include?('haml') ? 'haml' : 'erb'),
+          (gem_names.include?('sass') ? 'scss' : 'css')]
+      end
 
-    # needs tests
-    def self.conditionally_insert_routes routes_hash
-      if File.exists?(File.join('config', 'routes.rb'))
-        lines = Utils.read_file('config/routes.rb').split("\n")
-        last = lines.pop
-        routes_hash.each do |first, second|
-          if lines.grep(/#{second}/).empty?
-            lines << "  match '#{first}' => '#{second}'"
+      # needs tests
+      def self.conditionally_insert_routes routes_hash
+        if File.exists?(File.join('config', 'routes.rb'))
+          lines = Utils.read_file('config/routes.rb').split("\n")
+          last = lines.pop
+          routes_hash.each do |first, second|
+            if lines.grep(/#{second}/).empty?
+              lines << "  match '#{first}' => '#{second}'"
+            end
           end
-        end
-        lines << last
-        File.open(File.join('config', 'routes.rb'), 'w') do |f|
-          lines.each do |line|
-            f.puts line
+          lines << last
+          File.open(File.join('config', 'routes.rb'), 'w') do |f|
+            lines.each do |line|
+              f.puts line
+            end
           end
         end
       end
-    end
 
-    # needs tests
-    def self.conditionally_install_gems *gem_names
-      if File.exists?('Gemfile')
-        lines = Utils.read_file('Gemfile').split("\n")
-        gem_names.each do |gem_name|
-          if lines.grep(/#{gem_name}/).empty?
-            lines << "gem '#{gem_name}'"
-          end
+      def self.add_gem_to_gemfile gem_name
+        File.open('Gemfile', 'a') do |f|
+          f.puts "gem '#{gem_name}'"
         end
-        File.open('Gemfile', 'w') do |f|
-          lines.each do |line|
-            f.puts line
-          end
-        end
-
-        # actually install the gems
-        Safe.system_call 'bundle'
       end
     end
   end

data/lib/railsthemes/version.rb

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

data/spec/lib/railsthemes/email_installer_spec.rb

@@ -3,6 +3,45 @@ require 'railsthemes'
 
 describe Railsthemes::EmailInstaller do
   before do
-    setup_logging
+    setup_logger
+    @installer = Railsthemes::EmailInstaller.new
+    @tempdir = stub_tempdir
+  end
+
+  describe '#install_mail_gems_if_necessary' do
+    it 'should install no new gems if premailer-rails3 gem already installed' do
+      File.open('Gemfile.lock', 'w') do |f|
+        f.write using_gems 'premailer-rails3', 'hpricot'
+      end
+      dont_allow(Railsthemes::Utils).add_gem_to_gemfile(anything)
+      dont_allow(Railsthemes::Safe).system_call('bundle')
+      @installer.install_mail_gems_if_necessary
+    end
+
+    it 'when nokogiri already installed, should install the pr3 gem' do
+      File.open('Gemfile.lock', 'w') do |f|
+        f.write using_gems 'nokogiri'
+      end
+      mock(Railsthemes::Utils).add_gem_to_gemfile('premailer-rails3')
+      mock(Railsthemes::Safe).system_call('bundle')
+      @installer.install_mail_gems_if_necessary
+    end
+
+    it 'when hpricot already installed, should install the pr3 gem only' do
+      File.open('Gemfile.lock', 'w') do |f|
+        f.write using_gems 'hpricot'
+      end
+      mock(Railsthemes::Utils).add_gem_to_gemfile('premailer-rails3')
+      mock(Railsthemes::Safe).system_call('bundle')
+      @installer.install_mail_gems_if_necessary
+    end
+
+    it 'when no xml gem or pr3 installed, should install the pr3 gem and hpricot' do
+      FileUtils.touch('Gemfile.lock')
+      mock(Railsthemes::Utils).add_gem_to_gemfile('hpricot')
+      mock(Railsthemes::Utils).add_gem_to_gemfile('premailer-rails3')
+      mock(Railsthemes::Safe).system_call('bundle')
+      @installer.install_mail_gems_if_necessary
+    end
   end
 end

data/spec/lib/railsthemes/utils_spec.rb

@@ -50,6 +50,17 @@ describe Railsthemes::Utils do
     end
   end
 
+  describe 'add_gem_to_gemfile' do
+    it 'should add the gem to the Gemfile' do
+      Railsthemes::Utils.add_gem_to_gemfile 'test'
+      Railsthemes::Utils.add_gem_to_gemfile 'test'
+      lines = File.open('Gemfile').readlines.map(&:strip)
+      lines.count.should == 2
+      lines[0].should == "gem 'test'"
+      lines[1].should == "gem 'test'"
+    end
+  end
+
   describe 'download' do
     it 'should log and abort if file not found at url' do
       FakeWeb.register_uri :get,

metadata

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