hoe 3.2.0 → 3.3.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 3.3.0 / 2012-11-12
+
+* 3 minor enhancements:
+
+  * Added Sow#make_sub_modules. (bhenderson)
+  * Hoe.normalize_names now returns test class name separately. (bhenderson)
+  * Sow now generates test and impl files with proper namespacing. (bhenderson)
+
 === 3.2.0 / 2012-11-09
 
 * 3 minor enhancements:

data/Manifest.txt

@@ -31,7 +31,7 @@ template/README.txt.erb
 template/Rakefile.erb
 template/bin/file_name.erb
 template/lib/file_name.rb.erb
-template/test/test_file_name.rb.erb
+template/test/file_name.rb.erb
 test/test_hoe.rb
 test/test_hoe_debug.rb
 test/test_hoe_gemcutter.rb

data/bin/sow

@@ -20,6 +20,16 @@ def check_subdir option
   end
 end
 
+def make_sub_modules klass
+  last = nil
+  result = ''
+  klass.split('::')[0..-2].each do |part|
+    last = [last, part].compact.join('::')
+    result << "module #{last}; end\n"
+  end
+  result << "\n" unless result.empty?
+end
+
 op = OptionParser.new do |opts|
   opts.banner = "Usage: sow [options] project_name"
 
@@ -79,7 +89,7 @@ project = ARGV.shift
 abort op.to_s unless project
 abort "Project #{project} seems to exist" if test ?d, project
 
-_, file_name, klass = Hoe.normalize_names project
+_, file_name, klass, test_klass = Hoe.normalize_names project
 
 FileUtils.cp_r template_path, project
 
@@ -96,7 +106,7 @@ Dir.chdir project do
     warn "erb: #{path}"
 
     File.open path, "w" do |io|
-      erb = ERB.new file
+      erb = ERB.new file, nil, '<>'
       erb.filename = path
       io.puts erb.result(binding)
     end
@@ -105,12 +115,17 @@ Dir.chdir project do
   paths.grep(/file_name|\.erb$/).each do |file|
     new_file = file.sub(/file_name/, file_name).sub(/\.erb$/, '')
 
-    # TODO change template to separate a flat filename from a directory
-    # filename
-    if file =~ /^(bin|test)/ then
+    case file
+    when /^bin/ then
       dir, *rest = new_file.split File::SEPARATOR
 
       new_file = File.join dir, rest.join('_')
+    when /^test/ then
+      dir, *rest = new_file.split File::SEPARATOR
+
+      rest.last.sub! /^/, 'test_'
+
+      new_file = File.join dir, *rest
     end
 
     FileUtils.mkdir_p File.dirname new_file

data/lib/hoe.rb

@@ -91,7 +91,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -327,7 +327,7 @@ class Hoe
   end
 
   ##
-  # Normalize a project name into the project, file, and klass names that
+  # Normalize a project name into the project, file, klass and test names that
   # follow Ruby package naming guidelines.
   #
   # Project names are lowercase with _ separating package parts and -
@@ -337,14 +337,17 @@ class Hoe
   # extension parts.  net-http-persistent becomes net/http/persistent.
   #
   # Klass names are CamelCase with :: separating extension parts.
+  #
+  # Test klass names are same as Klass with Test prepended to each part.
 
   def self.normalize_names project # :nodoc:
-    project   = project.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
-    klass     = project.gsub(/(?:^|_)([a-z])/) { $1.upcase }
-    klass     = klass.  gsub(/(?:^|-)([a-z])/) { "::#{$1.upcase}" }
-    file_name = project.gsub(/-/, '/')
+    project    = project.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
+    klass      = project.gsub(/(?:^|_)([a-z])/) { $1.upcase }
+    klass      = klass.  gsub(/(?:^|-)([a-z])/) { "::#{$1.upcase}" }
+    test_klass = klass.  gsub(/(^|::)([A-Z])/) { "#{$1}Test#{$2}" }
+    file_name  = project.gsub(/-/, '/')
 
-    return project, file_name, klass
+    return project, file_name, klass, test_klass
   end
 
   ##

data/template/lib/file_name.rb.erb

@@ -1,3 +1,4 @@
+<%= make_sub_modules klass %>
 class <%= klass %>
   VERSION = '1.0.0'
 end

data/template/test/{test_file_name.rb.erb → file_name.rb.erb}

@@ -1,7 +1,8 @@
 require "test/unit"
 require "<%= file_name %>"
 
-class Test<%= klass %> < Test::Unit::TestCase
+<%= make_sub_modules test_klass %>
+class <%= test_klass %> < Test::Unit::TestCase
   def test_sanity
     flunk "write tests or I will kneecap you"
   end

data/test/test_hoe.rb

@@ -388,14 +388,14 @@ class TestHoe < MiniTest::Unit::TestCase
   end
 
   def test_rename
-    # project, file_name, klass = Hoe.normalize_names 'project_name'
-
-    assert_equal %w(    word      word     Word),    Hoe.normalize_names('word')
-    assert_equal %w(    word      word     Word),    Hoe.normalize_names('Word')
-    assert_equal %w(two_words two_words TwoWords),   Hoe.normalize_names('TwoWords')
-    assert_equal %w(two_words two_words TwoWords),   Hoe.normalize_names('twoWords')
-    assert_equal %w(two-words two/words Two::Words), Hoe.normalize_names('two-words')
-    assert_equal %w(two_words two_words TwoWords),   Hoe.normalize_names('two_words')
+    # project, file_name, klass, test_klass = Hoe.normalize_names 'project_name'
+
+    assert_equal %w(    word      word     Word    TestWord),           Hoe.normalize_names('word')
+    assert_equal %w(    word      word     Word    TestWord),           Hoe.normalize_names('Word')
+    assert_equal %w(two_words two_words TwoWords   TestTwoWords),       Hoe.normalize_names('TwoWords')
+    assert_equal %w(two_words two_words TwoWords   TestTwoWords),       Hoe.normalize_names('twoWords')
+    assert_equal %w(two-words two/words Two::Words TestTwo::TestWords), Hoe.normalize_names('two-words')
+    assert_equal %w(two_words two_words TwoWords   TestTwoWords),       Hoe.normalize_names('two_words')
   end
 
   def test_nosudo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 2
+  - 3
   - 0
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-11-09 00:00:00 Z
+date: 2012-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 4
-        - 1
-        version: "4.1"
+        - 2
+        version: "4.2"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,7 @@ files:
 - template/Rakefile.erb
 - template/bin/file_name.erb
 - template/lib/file_name.rb.erb
-- template/test/test_file_name.rb.erb
+- template/test/file_name.rb.erb
 - test/test_hoe.rb
 - test/test_hoe_debug.rb
 - test/test_hoe_gemcutter.rb

metadata.gz.sig

@@ -1 +1,2 @@
-e,s�e�&��,!�oJ��qP��
�\D�>��C�E�*bY*]"u����@D�$��%�)�{H��'�F
��52�4��
+"(r֑���Q��IKnP��=��x��i���p�W�gံ��9�ϴ���J���Y1?�qQ��8��50�3���E���ʥ+T���ա��K���r���A��$���1������r��'2��\կ2�Q�	���[׌�H�����[�xw���g`
+��n��$G� }0=C�Y�:�5v-�*/�a��Ka@]�����Er3�ʪ4�WF�-�l!�Ԯ�F�G�����:��}ΘҨf1�5�