install_theme 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.7.2 / 2009-10-10
+
+* CLI shows a useful error message when --partial argument is incorrectly formatted
+* added History link to README
+
 === 0.7.1 / 2009-10-08
 
 Major:

data/README.rdoc

@@ -2,6 +2,7 @@
 
 * http://drnicwilliams.com/2009/10/06/install-any-html-themetemplate-into-your-rails-app/
 * http://github.com/drnic/install_theme
+* http://github.com/drnic/install_theme/raw/master/History.txt
 
 == DESCRIPTION:
 

data/lib/install_theme.rb

@@ -10,7 +10,7 @@ require 'sass/css'
 require 'haml/exec'
 
 class InstallTheme
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
   attr_reader :layout_name

data/lib/install_theme/cli.rb

@@ -18,8 +18,13 @@ class InstallTheme
                 "Example using CSS path: --partial header:#header",
                 "Example using XPath: --partial \"header://div[@id='header']\"") do |arg|
                   options[:partials] ||= {}
-                  key, css_path = arg.split(/\s*:\s*/)[0..1]
-                  options[:partials][key.strip] = css_path.strip
+                  key, path = arg.split(/\s*:\s*/)[0..1]
+                  if key && path
+                    options[:partials][key.strip] = path.strip
+                  else
+                    stdout.puts partial_format_error(arg)
+                    exit
+                  end
                 end
         opts.on("-l", "--layout application", String,
                 "Set the layout file name.",
@@ -53,5 +58,12 @@ class InstallTheme
       end
       theme.apply_to_target
     end
+    
+    def self.partial_format_error(partial_argument)
+      <<-EOS.gsub(/^      /, '')
+      ERROR: Incorrect format for --partial argument "#{partial_argument}".
+      Correct format is: --partial label:path
+      EOS
+    end
   end
 end

data/spec/install_theme_cli_spec.rb

@@ -43,4 +43,15 @@ describe InstallTheme::CLI, "execute" do
       InstallTheme::CLI.execute(stdout_io, %w[path/to/rails_app path/to/template])
     end
   end
+  
+  it "shows useful error message for poorly formatted --partial argument" do
+    @stdout = stdout do |stdout_io|
+      lambda do
+        InstallTheme::CLI.execute(stdout_io, %w[path/to/rails_app path/to/template -p .just_dom])
+      end.should raise_error(Exception)
+    end
+    @stdout.should =~ /incorrect format for --partial argument ".just_dom"/i
+    @stdout.should =~ /correct format/i
+    @stdout.should =~ /label:path/i
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: install_theme
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +10:00
+date: 2009-10-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency