gem-release 0.0.24 → 0.1.0

data/lib/gem_release/gemspec.rb

@@ -9,8 +9,8 @@ module GemRelease
       @email       ||= user_email
       @homepage    ||= "https://github.com/#{github_user}/#{name}" || "[your github name]"
 
-      @summary     ||= '[summary]'
-      @description ||= '[description]'
+      @summary     ||= '[TODO: summary]'
+      @description ||= '[TODO: description]'
 
       @strategy = options[:strategy]
     end

data/lib/gem_release/helpers.rb

@@ -30,14 +30,6 @@ module GemRelease
       File.basename(Dir.pwd)
     end
 
-    def gem_module_path
-      gem_name.gsub('-', '_')
-    end
-
-    def gem_module_name
-      gem_module_path.camelize
-    end
-
     def gem_filename
       gemspec.file_name
     end

data/lib/gem_release/template.rb

@@ -6,7 +6,7 @@ module GemRelease
   class Template
     include GemRelease::Helpers
 
-    attr_reader :template, :name, :module_name, :module_path
+    attr_reader :template, :name, :module_names, :module_path
 
     def initialize(template, options = {})
       @template = template
@@ -16,9 +16,9 @@ module GemRelease
         meta_class.send(:attr_reader, key)
       end
 
-      @name        ||= gem_name_from_directory
-      @module_path ||= name.gsub('-', '_')
-      @module_name ||= module_path.camelize
+      @name         ||= gem_name_from_directory
+      @module_path  ||= name
+      @module_names ||= module_names_from_path(module_path)
     end
 
     def write
@@ -32,6 +32,14 @@ module GemRelease
 
     protected
 
+      def module_names_from_path(path)
+        names = []
+        path.split('-').each do |segment|
+          names << segment.camelize
+        end
+        names
+      end
+
       def render
         ERB.new(read_template, nil, "%").result(binding)
       end

data/lib/gem_release/templates/gemspec

@@ -5,7 +5,7 @@ require '<%= module_path %>/version'
 
 Gem::Specification.new do |s|
   s.name         = <%= name.inspect %>
-  s.version      = <%= module_name %>::VERSION
+  s.version      = <%= module_names.join('::') %>::VERSION
   s.authors      = [<%= author.inspect %>]
   s.email        = <%= email.inspect %>
   s.homepage     = <%= homepage.inspect %>

data/lib/gem_release/templates/version.rb

@@ -1,3 +1,12 @@
-module <%= module_name %>
-  VERSION = <%= version.inspect %>
-end
+<%=
+  i = 0
+  opening = ""
+  closing = ""
+  module_names.each do |n|
+    opening += "#{' ' * i}module #{n}\n"
+    closing =  "#{' ' * i}end\n" + closing
+    i += 2
+  end
+
+  opening + "#{' ' * i}VERSION = #{version.inspect}\n" + closing
+%>

data/lib/gem_release/version.rb

@@ -1,5 +1,5 @@
 module GemRelease
-  VERSION = '0.0.24'
+  VERSION = '0.1.0'
 
   class Version < Template
     attr_reader :version

data/lib/gem_release/version_file.rb

@@ -29,11 +29,19 @@ module GemRelease
     end
 
     def filename
-      File.expand_path("lib/#{gem_module_path}/version.rb")
+      path = gem_name
+      path = path.gsub('-', '/') unless File.exists?(path_to_version_file(path))
+      path = path.gsub('/', '_') unless File.exists?(path_to_version_file(path))
+
+      File.expand_path(path_to_version_file(path))
     end
 
     protected
 
+      def path_to_version_file(path)
+        "lib/#{path}/version.rb"
+      end
+
       def require_version
         silence { require(filename) }
       end

data/lib/rubygems/commands/bootstrap_command.rb

@@ -8,7 +8,7 @@ class Gem::Commands::BootstrapCommand < Gem::Command
   DEFAULTS = {
     :gemspec  => true,
     :strategy => 'git',
-    :scaffold => false,
+    :scaffold => true,
     :github   => false,
     :quiet    => false
   }
@@ -19,8 +19,8 @@ class Gem::Commands::BootstrapCommand < Gem::Command
     super 'bootstrap', 'Bootstrap a new gem source repository', DEFAULTS.merge(options)
 
     option :gemspec,  '-g', 'Generate a .gemspec'
-    option :strategy, '-f', 'Strategy for collecting files [glob|git] in .gemspec'
     option :scaffold, '-s', 'Scaffold lib/[gem_name]/version.rb README test/'
+    option :strategy, '-f', 'Strategy for collecting files [glob|git] in .gemspec'
     option :github,   '-h', 'Bootstrap a git repo, create on github and push'
     option :quiet,    '-q', 'Do not output status messages'
 
@@ -32,6 +32,7 @@ class Gem::Commands::BootstrapCommand < Gem::Command
     in_bootstrapped_dir do
       write_scaffold if options[:scaffold]
       write_gemspec  if options[:gemspec]
+      init_git       if options[:github] || options[:args] # safe to 'git init' in new dir
       create_repo    if options[:github]
     end
   end
@@ -64,13 +65,15 @@ class Gem::Commands::BootstrapCommand < Gem::Command
     end
   end
 
+  def init_git
+    say 'Initializing git repository'
+    `git init`
+  end
+
   def create_repo
     options = { :login => github_user, :token => github_token, :name  => gem_name }
     options = options.map { |name, value| "-F '#{name}=#{value}'" }.join(' ')
 
-    say 'Bootstrapializing git repository'
-    `git init`
-
     say 'Staging files'
     `git add .`
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-release
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 24
-  version: 0.0.24
+  version: 0.1.0
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 -04:00
+date: 2012-01-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency