railsthemes 1.2.0 → 2.0.0.pre

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzIyNDY4YWY0ZjFkMGZmNGFjMTAzNDlhMTE2NTM5YjRmNDEwZGEzNw==
+  data.tar.gz: !binary |-
+    NWJiNjUzZDcyMjMyZjY0NmY4NzllZjMxYTFlMjQ2Yzg4ZGE5MTM4NQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2E0NTYzZmMwNGY4NWJkOGE1ZGI5MWRjNzYwZGE0MzlmN2RlZjUyNmJmMDg1
+    OTA4MzMxYWNmMTZlZDgyNTRhMGU5MzFhODUxOThiMzBmMGM5NDljNjJlNDY4
+    YjQ5ZDIxNzRkZTNkYWNiNjY3MzY5YmVhNDViYjAzY2ViZGRmZDA=
+  data.tar.gz: !binary |-
+    NTFiYWIwMjM4YjY0MWUxOTc1ZDhjMWYyOWI3MzVjMTJkOWVmZjFlZmQzNjgy
+    MTEzNzBkZjQ1Nzc4YTFkYTczMWM0Y2Q3YzJmOWNjNWViYTBiZWFmOWE2N2Ux
+    MzFkYzEyYjUyMjg5NGFmZDQ0MWVhMjcyNjUzYzFiNzQyYjcwZmE=

data/.rvmrc

@@ -1,4 +1,2 @@
-# because "Rails 3.1 requires at least Ruby 1.8.7"
-# can upgrade safely when we get past this
-# would also be nice to test 1.9.2, 1.9.3 to ensure that they work as well
-rvm use ree-1.8.7-head@railsthemes --create
+# because "Rails 4 requires at least Ruby 1.9.3"
+rvm use ruby-1.9.3@railsthemes --create

data/Gemfile

@@ -4,14 +4,12 @@ gemspec
 
 group :development do
   gem 'gem-release'
-  gem 'guard'
-  gem 'guard-rspec'
 end
 
 group :test do
-  gem 'rspec'
-  gem 'rr'
-  gem 'autotest'
-  gem 'fakefs', :require => 'fakefs/safe', :git => 'https://github.com/RailsThemes/fakefs.git'
+  gem 'aruba', :github => 'cucumber/aruba'
+  gem 'fakefs', :require => 'fakefs/safe', :git => 'https://github.com/defunkt/fakefs.git'
   gem 'fakeweb'
+  gem 'rr'
+  gem 'rspec'
 end

data/Rakefile

@@ -1,9 +1,12 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'
+require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new('spec')
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--format pretty"
+end
+task :cuc => :cucumber
 
-# If you want to make this the default task
-task :default => :spec
+RSpec::Core::RakeTask.new(:spec)
+task :default => [:spec, :cucumber]

data/bin/railsthemes

@@ -14,8 +14,10 @@ class Installer < Thor
       puts Railsthemes::VERSION
     else
       puts <<-EOS
+Usage:
 railsthemes -v                       # Print the version of the installer gem you are using
 railsthemes install your@email:code  # Install from RailsThemes.com using your download code
+railsthemes list                     # List all themes installed in this app
 railsthemes help [TASK]              # Describe available tasks or one specific task
 EOS
     end
@@ -24,36 +26,20 @@ EOS
 
   desc "install your@email:code", "Install from RailsThemes.com using your download code"
   method_option :file,
-    :desc => "Use local relative pathname instead of a code, and install from there.",
-    :type => :boolean
+    :desc => "Install using local relative pathname instead of a code.", :type => :boolean
   method_option :staging,
-    :desc => "Hit the staging server instead of https://railsthemes.com.",
-    :type => :boolean
+    :desc => "Hit the staging server instead of https://railsthemes.com.", :type => :boolean
   method_option :server,
-    :desc => "Hit an arbitrary server instead of https://railsthemes.com.",
-    :type => :string
+    :desc => "Hit an arbitrary server instead of https://railsthemes.com.", :type => :string
   method_option :no_doc_popup,
-    :desc => "Do not pop up documentation on successful install.",
-    :type => :boolean
+    :desc => "Do not pop up documentation on successful install.", :type => :boolean
   method_option :verbose,
-    :desc => "Print more output on installation.",
-    :type => :boolean
+    :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
+    :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
-
-    if options[:email]
-    end
-
-    installer.doc_popup = !options[:no_doc_popup]
-    Railsthemes::Logging.verbose if options[:verbose]
-    Railsthemes::Logging.debug if options[:debugging]
-    Railsthemes.server = 'http://staging.railsthemes.com' if options[:staging]
-    Railsthemes.server = options[:server] if options[:server]
+    installer = Railsthemes::Installer.new options
 
     if options[:file]
       file = code_or_file
@@ -66,7 +52,17 @@ EOS
     end
   end
 
-  # AP: other options could include list, remove, help, etc.
+  desc "list", "List all themes installed in this app"
+  def list
+    switcher = Railsthemes::Switcher.new
+    switcher.list
+  end
+
+  desc "use", "Use a RailsTheme Theme installed in this app"
+  def use theme
+    switcher = Railsthemes::Switcher.new
+    switcher.switch_to theme
+  end
 end
 
 Installer.start ARGV

data/features/railsthemes.feature

@@ -0,0 +1,11 @@
+Feature: Running railsthemes on the command-line
+  As a RailsThemes customer
+  In order to install my theme on the command-line
+  I want to run the installer
+
+  Scenario: Running without any parameters
+    When I run `railsthemes`
+    Then the output should contain:
+    """
+    Usage:
+    """

data/features/support/env.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/lib/railsthemes/email_installer.rb

@@ -1,87 +1,26 @@
 module Railsthemes
-  class EmailInstaller < Thor
-    no_tasks do
-      include Railsthemes::Logging
-      include Thor::Actions
+  class EmailInstaller
+    include Railsthemes::Logging
 
-      def install_from_file_system original_source_filepath
-        logger.warn 'Installing email theme...'
-        source_filepath = original_source_filepath.gsub(/\\/, '/')
-        logger.info "Source filepath: #{source_filepath}"
+    def install
+      logger.warn 'Installing email...'
 
-        if File.directory?(source_filepath)
-          install_from_directory source_filepath
-        elsif Utils.archive?(source_filepath + '.tar.gz')
-          install_from_archive source_filepath + '.tar.gz'
-        end
-      end
-
-      def install_from_directory source_filepath
-        Dir["#{source_filepath}/email/**/*"].each do |src|
-          logger.debug "src: #{src}"
-          dest = src.sub("#{source_filepath}/email/", '')
-          logger.debug "dest: #{dest}"
-          if File.directory?(src)
-            unless File.directory?(dest)
-              logger.debug "mkdir -p #{dest}"
-              FileUtils.mkdir_p(dest)
-            end
-          else
-            unless src =~ /\/\./ # remove any pesky hidden files that crept into the archive
-              logger.debug "cp #{src} #{dest}"
-              FileUtils.cp(src, dest)
-            end
-          end
-        end
-
-        inject_into_file File.join('app', 'controllers', 'railsthemes_controller.rb'), :after => 'class RailsthemesController < ApplicationController', :verbose => false do
-<<-EOS
-
-def email
-end
-
-def send_email
-  RailsthemesMailer.test_email(:to => params[:email]).deliver
-  render :sent_email
-end
-EOS
-        end
+      install_mail_gems_if_necessary
 
-        Utils.conditionally_insert_routes({
-          'railsthemes/email' => 'railsthemes#email',
-          'railsthemes/send_email' => 'railsthemes#send_email'
-        })
-
-        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)"
-        end
-
-        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
+      logger.warn 'Done installing email.'
+    end
 
-      def install_from_archive filepath
-        Railsthemes::Utils.with_tempdir do |tempdir|
-          Utils.unarchive filepath, tempdir
-          install_from_file_system tempdir
+    def install_mail_gems_if_necessary
+      gem_names = Utils.gemspecs.map(&:name)
+      logger.debug "gem_names: #{gem_names}"
+      unless gem_names.include?('premailer-rails')
+        if (gem_names & ['hpricot', 'nokogiri']).empty?
+          Utils.add_gem_to_gemfile 'hpricot'
         end
+        logger.warn 'Installing assistant mail gems...'
+        Utils.add_gem_to_gemfile 'premailer-rails'
+        logger.warn 'Done installing assistant mail gems.'
       end
-
     end
   end
 end

data/lib/railsthemes/ensurer.rb

@@ -12,7 +12,7 @@ module Railsthemes
       ensure_railsthemes_is_not_in_gemfile
       ensure_vcs_is_clean
       ensure_rails_version_is_valid
-      ensure_installer_is_up_to_date unless options[:hit_server] == false
+      ensure_installer_is_up_to_date(options[:server]) if options[:server]
       @@already_checked = true
     end
 
@@ -54,9 +54,9 @@ Please roll back or commit the changes before proceeding to ensure that you can
       end
     end
 
-    def self.ensure_installer_is_up_to_date
+    def self.ensure_installer_is_up_to_date server
       logger.warn "Checking installer version..."
-      url = Railsthemes.server + '/installer/version'
+      url = server + '/installer/version'
       logger.debug "installer version url: #{url}"
       begin
         response = Utils.get_url url

data/lib/railsthemes/installer.rb

@@ -1,160 +1,142 @@
 module Railsthemes
-  class Installer < Thor
-    no_tasks do
-      include Railsthemes::Logging
-      include Thor::Actions
-
-      def initialize
-        @doc_popup = true
-        @installed_email = false
-      end
+  class Installer
+    include Railsthemes::Logging
 
-      def doc_popup= doc_popup
-        @doc_popup = doc_popup
-      end
+    def initialize options = {}
+      @installed_email = false
 
-      # can probably just make static
-      def theme_installer
-        @theme_installer ||= ThemeInstaller.new
-      end
+      @doc_popup = !options[:no_doc_popup]
+      server = 'http://staging.railsthemes.com' if options[:staging]
+      server = options[:server] if options[:server]
+      server ||= 'https://railsthemes.com'
+      server = nil if options[:file]
+      @server = server
 
-      # can probably just make static
-      def email_installer
-        @email_installer ||= EmailInstaller.new
-      end
+      Railsthemes::Logging.verbose if options[:verbose]
+      Railsthemes::Logging.debug if options[:debugging]
+    end
 
-      # can probably just make static
-      def asset_installer
-        @asset_installer ||= AssetInstaller.new
-      end
+    attr_accessor :doc_popup, :server
 
-      def popup_documentation
-        style_guides = Dir['doc/*Usage_And_Style_Guide.html']
-        # need better tests of popping up multiple docs
-        style_guides.each do |style_guide|
-          logger.debug("style_guide: #{style_guide}")
-          Launchy.open(style_guide) if style_guide
-        end
-      end
+    def server= server
+      @server = server
+      Logging.logger.warn "Using server: #{@server}"
+    end
+
+    # can probably just make static
+    def theme_installer
+      @theme_installer ||= ThemeInstaller.new
+    end
 
-      def install_from_file_system original_source_filepath
-        Ensurer.ensure_clean_install_possible :hit_server => false
+    def email_installer
+      @email_installer ||= EmailInstaller.new
+    end
 
-        # install main theme
-        config = Utils.get_primary_configuration
-        filepath = File.join(original_source_filepath, config.join('-'))
-        if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
-          theme_installer.install_from_file_system filepath
-        else
-          Safe.log_and_abort "Could not find the file you need: #{filepath}"
+    def popup_documentation
+      latest_installed_dir = Dir.glob("doc/railsthemes_*").max_by {|f| File.mtime(f)}
+      if latest_installed_dir
+        Dir[File.join(latest_installed_dir, '*.html')].each do |document|
+          logger.debug("document: #{document}")
+          Launchy.open(document) if document
         end
+      end
+    end
 
-        # install email theme if present
-        filepath = File.join(original_source_filepath, 'email')
-        if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
-          email_installer.install_from_file_system filepath
-          @installed_email = true
-        end
+    def install_from_file_system filepath
+      Ensurer.ensure_clean_install_possible :server => false
 
-        # install design assets if present
-        filepath = File.join(original_source_filepath, 'design-assets')
-        if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
-          asset_installer.install_from_file_system filepath
-          @installed_assets = true
+      # install main theme
+      if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
+        theme_installer.install_from_file_system filepath
+        if Dir['app/mailers/railsthemes*'].count > 0
+          email_installer.install
         end
-
-        print_post_installation_instructions
-        popup_documentation if @doc_popup
+      else
+        Safe.log_and_abort "Could not find the file you need: #{filepath}"
       end
 
-      def install_from_code code
-        Ensurer.ensure_clean_install_possible :hit_server => true
+      logger.warn 'Bundling to install new gems...'
+      Safe.system_call 'bundle'
+      logger.warn 'Done bundling.'
 
-        logger.warn "Figuring out what to download..."
-        send_gemfile code
-
-        dl_hash = get_download_hash code
+      print_post_installation_instructions
+      popup_documentation if @doc_popup
+    end
 
-        if dl_hash
-          logger.debug "dl_hash: #{dl_hash.inspect}"
-          Utils.with_tempdir do |tempdir|
-            download_from_hash dl_hash, tempdir
-            install_from_file_system tempdir
-          end
-        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
+    def install_from_code code
+      Ensurer.ensure_clean_install_possible :server => @server
 
+      logger.warn "Figuring out what to download..."
+      send_gemfile code
 
-      def get_download_hash code
-        config = Utils.get_primary_configuration
-        server_request_url = "#{Railsthemes.server}/download?code=#{code}&config=#{config * ','}&v=2"
-        response = nil
-        begin
-          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.debug e.message
-          logger.debug e.backtrace
-        end
+      download_url = get_download_url code
 
-        if response && response.code.to_s == '200'
-          JSON.parse(response.body)
-        else
-          nil
+      if download_url
+        logger.debug "download_url: #{download_url}"
+        Utils.with_tempdir do |tempdir|
+          download_from_url download_url, tempdir
+          install_from_file_system File.join(tempdir, 'rt-archive')
         end
+      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
 
-      def download_from_hash dl_hash, download_to
-        url = dl_hash['theme']
-        if url
-          logger.warn "Downloading main theme..."
-          config = Utils.get_primary_configuration
-          archive = File.join(download_to, "#{config.join('-')}.tar.gz")
-          Utils.download :url => url, :save_to => archive
-          logger.warn "Done downloading main theme."
-        end
+    def get_download_url code
+      config = Utils.get_primary_configuration
+      server_request_url = "#{@server}/download?code=#{code}&config=#{config * ','}&v=2"
+      response = nil
+
+      begin
+        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.debug e.message
+        logger.debug e.backtrace
+      end
 
-        url = dl_hash['email']
-        if url
-          logger.warn "Downloading email theme..."
-          archive = File.join(download_to, 'email.tar.gz')
-          Utils.download :url => url, :save_to => archive
-          logger.warn "Done downloading email theme."
+      if response
+        if response.code.to_s == '200'
+          response.body
+        else
+          logger.debug "download_url response code: #{response(:code)}"
         end
+      end
+    end
 
-        url = dl_hash['design_assets']
-        if url
-          logger.warn "Downloading design assets..."
-          archive = File.join(download_to, 'design-assets.tar.gz')
-          Utils.download :url => url, :save_to => archive
-          logger.warn "Done downloading design assets."
-        end
+    def download_from_url url, download_to
+      if url
+        logger.warn "Downloading theme..."
+        config = Utils.get_primary_configuration
+        archive = File.join(download_to, "rt-archive.tar.gz")
+        Utils.download :url => url, :save_to => archive
+        logger.warn "Done downloading theme."
       end
+    end
 
-      def send_gemfile code
-        return nil unless File.exists?('Gemfile.lock')
-        begin
-          RestClient.post("#{Railsthemes.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
-        end
+    def send_gemfile code
+      return nil unless File.exists?('Gemfile.lock')
+      begin
+        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
       end
+    end
 
-      def print_post_installation_instructions
-        logger.warn <<-EOS
+    def print_post_installation_instructions
+      logger.warn <<-EOS
 
 Yay! Your theme is installed!
 
-=============================
 
 Documentation and help
+======================
 
 Theme documentation is located in the doc folder.
 
@@ -163,26 +145,20 @@ There are some help articles for your perusal at http://support.railsthemes.com.
 
 What now?
 EOS
-        with_number("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.")
-        with_number "Start or restart your development server."
-        with_number("Check out the local theme samples at:",
-                    "http://localhost:3000/railsthemes/landing",
-                    "http://localhost:3000/railsthemes/inner",
-                    "http://localhost:3000/railsthemes/jquery_ui")
-        with_number("Ensure your new application layout file contains everything that you wanted",
-                    "from the old one.")
-        with_number("For instructions on how to send RailsThemes-styled emails in your app,",
-                    "check out the documentation in the docs folder.") if @installed_email
-        with_number "Let us know how it went: @railsthemes or support@railsthemes.com."
-      end
+      with_number "Start or restart your development server."
+      with_number("Check out the local theme samples at:  http://localhost:3000/railsthemes")
+      with_number("Ensure your new application layout file contains everything that you wanted",
+                  "from the old one.")
+      with_number("For instructions on how to send RailsThemes-styled emails in your app,",
+                  "check out the documentation in the docs folder.") if @installed_email
+      with_number "Let us know how it went: @railsthemes or support@railsthemes.com."
+    end
 
-      def with_number *lines
-        @number ||= 0
-        logger.warn "#{@number += 1}) #{lines[0]}"
-        lines[1..-1].each do |line|
-          logger.warn "   #{line}"
-        end
+    def with_number *lines
+      @number ||= 0
+      logger.warn "#{@number += 1}) #{lines[0]}"
+      lines[1..-1].each do |line|
+        logger.warn "   #{line}"
       end
     end
   end

data/lib/railsthemes/switcher.rb

@@ -0,0 +1,33 @@
+module Railsthemes
+  class Switcher
+    include Railsthemes::Logging
+
+    def list
+      themes = installed_themes
+      if themes.empty?
+        logger.warn 'There are currently no RailsThemes themes installed.'
+      else
+        logger.warn 'RailsThemes themes currently installed:'
+        themes.each do |theme|
+          logger.warn " - #{theme}"
+        end
+      end
+    end
+
+    def switch_to theme_name
+      themes = installed_themes
+      if themes.include? theme_name
+        Utils.set_layout_in_application_controller theme_name
+      else
+        logger.warn "'#{theme_name}' is not a locally installed RailsThemes theme."
+      end
+    end
+
+    def installed_themes
+      Dir['app/assets/stylesheets/railsthemes_*'].inject([]) do |accum, filepath|
+        accum << File.basename(filepath).gsub(/^railsthemes_/, '') if File.directory?(filepath)
+        accum
+      end
+    end
+  end
+end

data/lib/railsthemes/tar.rb

@@ -33,7 +33,7 @@ module Railsthemes
     end
 
     # gzips the underlying string in the given StringIO,
-    # returning a new StringIO representing the 
+    # returning a new StringIO representing the
     # compressed file.
     def self.gzip(tarfile)
       gz = StringIO.new("")
@@ -49,10 +49,9 @@ module Railsthemes
     # 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
+      Zlib::GzipReader.open(tarfile) do |f|
+        StringIO.new(f.read)
+      end
     end
 
     # untars the given IO into the specified