convert_theme 0.1.0 → 0.2.0

data/History.txt

@@ -1,4 +1,18 @@
-=== 0.0.1 2009-09-26
+=== 0.2.0 / 2009-09-26
+
+Major:
+* Using Rubigen to install files, which means you get
+  prompted about conflicts.
+
+Commits:
+* Running specs no longer spews out the rubigen create/exists logs
+* Better checking for file vs directory?
+* using rubigen run install modified template files into target rails app
+* wired in more options to CLI
+* adding hoe-git plugin
+* Added README content
+
+=== 0.1.0 2009-09-26
 
 * 1 major enhancement:
   * Initial release

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 bin/convert_theme
 lib/convert_theme.rb
 lib/convert_theme/cli.rb
+lib/convert_theme/convert_theme_generator.rb
 script/console
 script/destroy
 script/generate

data/Rakefile

@@ -4,15 +4,17 @@ require 'fileutils'
 require './lib/convert_theme'
 
 Hoe.plugin :newgem
+Hoe.plugin :git
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'convert_theme' do
   developer 'Dr Nic Williams', 'drnicwilliams@gmail.com'
   self.rubyforge_name = "drnicutilities"
-  self.extra_deps << ['hpricot','>= 0.8.1']
-  self.extra_dev_deps << ['rails', '2.3.4']
-  self.extra_dev_deps << ['haml']
+  extra_deps << ['hpricot','>= 0.8.1']
+  extra_deps << ['rubigen','>= 1.5.2']
+  extra_dev_deps << ['rails', '2.3.4']
+  extra_dev_deps << ['haml']
 end
 
 require 'newgem/tasks'

data/lib/convert_theme/cli.rb

@@ -18,6 +18,11 @@ class ConvertTheme
         opts.on("--content_id=CONTENT_ID", String,
                 "DOM id for the main DOM element for the <%= yield %>.",
                 "Default: content") { |arg| options[:content_id] = arg }
+        opts.on("--haml",
+                "Generate HAML templates.") { |arg| options[:template_type] = 'haml' }
+        opts.on("--index_path=index.html", String,
+                "HTML page to use for application layout.",
+                "Default: index.html") { |arg| options[:index_path] = arg }
         opts.on("-h", "--help",
                 "Show this help message.") { stdout.puts opts; exit }
         opts.parse!(arguments)

data/lib/convert_theme/convert_theme_generator.rb

@@ -0,0 +1,20 @@
+class ConvertTheme::ConvertThemeGenerator < RubiGen::Base
+  # NOTE: runtime_options[:source] needs to be passed in to #new
+  
+  def manifest
+    record do |m|
+      files = Dir[File.join(source_root, "**/*")].map do |f|
+        f.gsub(source_root, "").gsub(%r{^/}, '')
+      end
+      directories = files.map { |f| File.dirname(f) }.uniq.sort
+      directories.each do |dir|
+        m.directory dir
+      end
+      files.sort.each do |f|
+        next if File.directory?(File.join(source_root, f))
+        m.file f, f
+      end
+    end
+  end
+  
+end

data/lib/convert_theme.rb

@@ -2,9 +2,11 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require "hpricot"
+require "rubigen"
+require 'rubigen/scripts/generate'
 
 class ConvertTheme
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
   
   attr_reader :template_root, :index_path, :rails_path, :template_type
   attr_reader :stylesheet_dir, :javascript_dir, :image_dir
@@ -17,13 +19,16 @@ class ConvertTheme
     @stylesheet_dir = options[:stylesheet_dir] || detect_stylesheet_dir
     @javascript_dir = options[:javascript_dir] || detect_javascript_dir
     @image_dir      = options[:image_dir] || detect_image_dir
+    @stdout         = options[:stdout] || $stdout
+    
+    setup_template_temp_path
   end
   
   def apply_to(rails_path, options = {})
     @rails_path = rails_path
     @template_type = (options[:template_type] || detect_template).to_s
 
-    File.open(File.join(rails_path, 'app/views/layouts/application.html.erb'), "w") do |file|
+    File.open(File.join(template_temp_path, 'app/views/layouts/application.html.erb'), "w") do |file|
       index_file = File.read(File.join(template_root, index_path)).gsub(/\r/, '')
       doc = Hpricot(index_file)
       doc.search("##{content_id}").each do |div|
@@ -37,17 +42,43 @@ class ConvertTheme
     end
     
     template_stylesheets.each do |file|
-      File.open(File.join(rails_path, 'public/stylesheets', File.basename(file)), "w") do |f|
+      File.open(File.join(template_temp_path, 'public/stylesheets', File.basename(file)), "w") do |f|
         contents = File.read(file)
         contents.gsub!(%r{url\((["']?)[./]*#{image_dir}}, 'url(\1/images')
         f << contents
       end
     end
     template_javascripts.each do |file|
-      FileUtils.cp_r(file, File.join(rails_path, 'public/javascripts'))
+      FileUtils.cp_r(file, File.join(template_temp_path, 'public/javascripts'))
     end
     template_images.each do |file|
-      FileUtils.cp_r(file, File.join(rails_path, 'public/images'))
+      FileUtils.cp_r(file, File.join(template_temp_path, 'public/images'))
+    end
+    
+    # now use rubigen to install the files into the rails app
+    # so users can get conflict resolution options from command line
+    RubiGen::Base.reset_sources
+    RubiGen::Base.prepend_sources(RubiGen::PathSource.new(:internal, File.dirname(__FILE__)))
+    generator_options = options[:generator] || {}
+    generator_options.merge!(:stdout => @stdout, :no_exit => true,
+      :source => template_temp_path, :destination => rails_path)
+    RubiGen::Scripts::Generate.new.run(["convert_theme"], generator_options)
+  end
+  
+  # This generator's templates folder is temporary
+  # and is accessed via source_root within the generator.
+  def template_temp_path
+    @template_temp_path ||= begin
+      tmp_dir = ENV['TMPDIR'] || '/tmp'
+      template_path = File.join(tmp_dir, "convert_theme", "templates")
+    end
+  end
+  
+  def setup_template_temp_path
+    FileUtils.rm_rf(template_temp_path)
+    FileUtils.mkdir_p(template_temp_path)
+    %w[app/views/layouts public/images public/javascripts public/stylesheets].each do |app_path|
+      FileUtils.mkdir_p(File.join(template_temp_path, app_path))
     end
   end
   

data/spec/convert_theme_cli_spec.rb

@@ -1,22 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'convert_theme/cli'
 
-def stdout(&block)
-  stdout_io = StringIO.new
-  yield stdout_io
-  stdout_io.rewind
-  stdout_io.read
-end
-
 describe ConvertTheme::CLI, "execute" do
   before(:each) do
     theme = stub
     ConvertTheme.should_receive(:new).
-      with(:template_root => "path/to/app", :content_id => "content_box").
+      with(:template_root => "path/to/app", 
+        :content_id => "content_box",
+        :index_path => "root.html",
+        :template_type => "haml"
+      ).
       and_return(theme)
     theme.should_receive(:apply_to).with(".")
     @stdout = stdout do |stdout_io|
-      ConvertTheme::CLI.execute(stdout_io, ["path/to/app", ".", "--content_id=content_box"])
+      ConvertTheme::CLI.execute(stdout_io, %w[path/to/app .
+        --content_id=content_box
+        --index_path=root.html
+        --haml
+      ])
     end
   end
   

data/spec/convert_theme_spec.rb

@@ -4,8 +4,10 @@ describe ConvertTheme do
   context "bloganje theme to ERb" do
     before do
       setup_base_rails
-      @theme = ConvertTheme.new(:template_root => File.dirname(__FILE__) + "/fixtures/bloganje")
-      @theme.apply_to(@target_application)
+      stdout do |stdout|
+        @theme = ConvertTheme.new(:template_root => File.dirname(__FILE__) + "/fixtures/bloganje", :stdout => stdout)
+        @theme.apply_to(@target_application, :generator => {:collision => :force, :quiet => true})
+      end
       @expected_application = File.dirname(__FILE__) + "/expected/rails/bloganje"
     end
     it { @theme.should be_erb }
@@ -18,7 +20,7 @@ describe ConvertTheme do
         it do
           expected = clean_file(File.join(@expected_application, matching_file))
           actual   = File.join(@target_application, matching_file)
-          diff = `diff #{expected} #{actual}`
+          diff = `diff #{expected} #{actual}  2> /dev/null`
           rputs diff unless diff.strip.empty?
           diff.strip.should == ""
         end
@@ -31,7 +33,7 @@ describe ConvertTheme do
           it do
             expected = File.join(@expected_application, matching_file)
             actual   = File.join(@target_application, matching_file)
-            diff = `diff #{expected} #{actual}`
+            diff = `diff #{expected} #{actual}  2> /dev/null`
             rputs diff unless diff.strip.empty?
             diff.strip.should == ""
           end
@@ -42,10 +44,12 @@ describe ConvertTheme do
   context "webresourcedepot theme to ERb" do
     before do
       setup_base_rails
-      @theme = ConvertTheme.new(
-        :template_root => File.dirname(__FILE__) + "/fixtures/webresourcedepot",
-        :content_id => "center-column")
-      @theme.apply_to(@target_application)
+        stdout do |stdout|
+          @theme = ConvertTheme.new(
+            :template_root => File.dirname(__FILE__) + "/fixtures/webresourcedepot",
+            :content_id => "center-column", :stdout => $stdout)
+          @theme.apply_to(@target_application, :generator => {:collision => :force, :quiet => true})
+        end
       @expected_application = File.dirname(__FILE__) + "/expected/rails/webresourcedepot"
     end
     it { @theme.should be_erb }
@@ -54,7 +58,7 @@ describe ConvertTheme do
         it do
           expected = clean_file(File.join(@expected_application, matching_file))
           actual   = File.join(@target_application, matching_file)
-          diff = `diff #{expected} #{actual}`
+          diff = `diff #{expected} #{actual}  2> /dev/null`
           rputs diff unless diff.strip.empty?
           diff.strip.should == ""
         end
@@ -66,7 +70,7 @@ describe ConvertTheme do
           it do
             expected = File.join(@expected_application, matching_file)
             actual   = File.join(@target_application, matching_file)
-            diff = `diff #{expected} #{actual}`
+            diff = `diff #{expected} #{actual}  2> /dev/null`
             rputs diff unless diff.strip.empty?
             diff.strip.should == ""
           end

data/spec/spec_helper.rb

@@ -37,3 +37,10 @@ def setup_base_rails(options = {})
   @target_application
 end
 
+def stdout(&block)
+  stdout_io = StringIO.new
+  yield stdout_io
+  stdout_io.rewind
+  stdout_io.read
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: convert_theme
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubigen
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rails
   type: :development
@@ -80,6 +90,7 @@ files:
 - bin/convert_theme
 - lib/convert_theme.rb
 - lib/convert_theme/cli.rb
+- lib/convert_theme/convert_theme_generator.rb
 - script/console
 - script/destroy
 - script/generate