gem-release 0.0.16 → 0.0.17

data/lib/gem_release/command_options.rb

@@ -6,10 +6,9 @@ module GemRelease
     end
 
     def option(key, short, description)
-      options = self.class::OPTIONS
-      default = options[key]
+      default = self.class::DEFAULTS[key]
 
-      if String === default
+      if default.is_a?(String)
         long = "--#{key} #{key.to_s.upcase}"
         args = [short, long, String, "#{description} (defaults to #{default})"]
       else

data/lib/gem_release/gemspec.rb

@@ -1,21 +1,22 @@
 module GemRelease
   class Gemspec < Template
-    attr_reader :authors, :email, :homepage, :summary, :description
+    attr_reader :author, :email, :homepage, :summary, :description, :strategy
 
     def initialize(options = {})
-      super
+      super('gemspec', options)
 
-      @authors     ||= [user_name]
+      @author      ||= user_name
       @email       ||= user_email
-      @homepage    ||= "http://github.com/#{github_user}/#{name}" || "[your github name]"
+      @homepage    ||= "https://github.com/#{github_user}/#{name}" || "[your github name]"
 
       @summary     ||= '[summary]'
       @description ||= '[description]'
+
       @strategy = options[:strategy]
     end
 
     def files
-      case @strategy
+      case strategy
       when 'git'
         '`git ls-files app lib`.split("\n")'
       else
@@ -30,9 +31,5 @@ module GemRelease
     def filename
       "#{name}.gemspec"
     end
-
-    def template_name
-      'gemspec.erb'
-    end
   end
 end

data/lib/gem_release/helpers.rb

@@ -2,6 +2,10 @@ require 'core_ext/string/camelize'
 
 module GemRelease
   module Helpers
+    def quiet?
+      options[:quiet]
+    end
+
     def user_name
       `git config --get user.name`.strip
     end
@@ -11,15 +15,15 @@ module GemRelease
     end
 
     def github_user
-      @github_user ||= `git config --get github.user`.strip
+      `git config --get github.user`.strip
     end
 
     def github_token
-      @github_token ||= `git config --get github.token`.strip
+      `git config --get github.token`.strip
     end
 
     def gem_name
-      @gem_name ||= gemspec ? gemspec.name : gem_name_from_directory
+      gemspec ? gemspec.name : gem_name_from_directory
     end
 
     def gem_name_from_directory
@@ -27,11 +31,11 @@ module GemRelease
     end
 
     def gem_module_path
-      @gem_module_path ||= gem_name.gsub('-', '_')
+      gem_name.gsub('-', '_')
     end
 
     def gem_module_name
-      @gem_module_name ||= gem_module_path.camelize
+      gem_module_path.camelize
     end
 
     def gem_filename
@@ -43,17 +47,15 @@ module GemRelease
     end
 
     def gemspec
-      @gemspec ||= Gem::Specification.load(gemspec_filename)
+      Gem::Specification.load(gemspec_filename)
     rescue LoadError, RuntimeError
       nil
     end
 
     def gemspec_filename
-      @gemspec_filename ||= begin
-        name = Array(options[:args]).first rescue nil
-        name ||= Dir['*.gemspec'].first
-        name || raise("No gemspec found or given.")
-      end
+      name = Array(options[:args]).first rescue nil
+      name ||= Dir['*.gemspec'].first
+      name || raise("No gemspec found or given.")
     end
   end
 end

data/lib/gem_release/license.rb

@@ -0,0 +1,18 @@
+module GemRelease
+  class License < Template
+    attr_reader :author, :email, :year
+
+    def initialize(options = {})
+      super
+
+      @author  ||= user_name
+      @email   ||= user_email
+      @year    ||= Time.now.year
+    end
+
+    def template_name
+      'gemspec.erb'
+    end
+  end
+end
+

data/lib/gem_release/template.rb

@@ -6,11 +6,15 @@ module GemRelease
   class Template
     include GemRelease::Helpers
 
-    attr_reader :name, :module_name, :module_path, :options
+    attr_reader :template, :name, :module_name, :module_path
 
-    def initialize(options = {})
-      @options = options
-      options.each { |key, value| instance_variable_set(:"@#{key}", value) }
+    def initialize(template, options = {})
+      @template = template
+
+      options.each do |key, value|
+        instance_variable_set(:"@#{key}", value)
+        meta_class.send(:attr_reader, key)
+      end
 
       @name        ||= gem_name_from_directory
       @module_path ||= name.gsub('-', '_')
@@ -22,12 +26,22 @@ module GemRelease
       File.open(filename, 'w+') { |f| f.write(render) }
     end
 
-    def render
-      ERB.new(template, nil, "%").result(binding)
-    end
+    protected
 
-    def template
-      File.new(File.expand_path("../templates/#{template_name}", __FILE__)).read
-    end
+      def filename
+        template
+      end
+
+      def render
+        ERB.new(read_template, nil, "%").result(binding)
+      end
+
+      def read_template
+        File.new(File.expand_path("../templates/#{template}", __FILE__)).read
+      end
+
+      def meta_class
+        class << self; self; end
+      end
   end
 end

data/lib/gem_release/templates/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/lib/gem_release/templates/LICENSE

@@ -0,0 +1,21 @@
+MIT LICENSE
+
+Copyright (c) <% year %> <%= author %> <<%= email %>>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/gem_release/templates/{gemspec.erb → gemspec}

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

data/lib/gem_release/templates/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'bundler/setup'
+

data/lib/gem_release/version.rb

@@ -1,20 +1,16 @@
 module GemRelease
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 
   class Version < Template
     attr_reader :version
 
     def initialize(options = {})
-      super
+      super('version.rb', options)
       @version ||= '0.0.1'
     end
 
     def filename
       "lib/#{module_path}/version.rb"
     end
-
-    def template_name
-      'version.erb'
-    end
   end if defined?(Template)
 end

data/lib/gem_release/version_file.rb

@@ -15,11 +15,7 @@ module GemRelease
 
     def bump!
       File.open(filename, 'w+') { |f| f.write(bumped_content) }
-      force_load!
-    end
-
-    def force_load!
-      silence { load(filename) }
+      require_version
     end
 
     def new_number
@@ -38,6 +34,15 @@ module GemRelease
 
     protected
 
+      def require_version
+        $: << 'lib' unless $:.include?('lib')
+        require "#{gem_module_path}/version"
+      end
+
+      def force_load!
+        silence { load(filename) }
+      end
+
       def major(major, minor, patch)
         "#{major.to_i + 1}.0.0"
       end

data/lib/rubygems/commands/bootstrap_command.rb

@@ -5,51 +5,82 @@ class Gem::Commands::BootstrapCommand < Gem::Command
   include GemRelease, Gem::Commands
   include Helpers, CommandOptions
 
-  OPTIONS = { :gemspec => true, :strategy => 'git', :scaffold => false, :github => false }
+  DEFAULTS = {
+    :gemspec  => true,
+    :strategy => 'git',
+    :scaffold => false,
+    :github   => false,
+    :quiet    => false
+  }
 
   attr_reader :arguments, :usage
 
-  def initialize
-    super 'bootstrap', 'Bootstrap a new gem source repository', OPTIONS
+  def initialize(options = {})
+    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 :github,   '-h', 'Bootstrap a git repo, create on github and push'
+    option :quiet,    '-q', 'Do not output status messages'
   end
 
   def execute
-    write_gemspec  if options[:gemspec]
     write_scaffold if options[:scaffold]
+    write_gemspec  if options[:gemspec]
     create_repo    if options[:github]
   end
 
   def write_gemspec
-    GemspecCommand.new.invoke
+    GemspecCommand.new(:quiet => quiet?).invoke
   end
 
   def write_scaffold
-    say 'scaffolding lib/ README test/'
-    `mkdir lib test`
-    `touch README`
-    write_version
-    write_rakefile
+    say 'scaffolding ...' unless quiet?
+    create_lib
+    create_readme
+    create_license
+    create_gemfile
+    create_test_helper
+    create_version
+    create_rakefile
+  end
+
+  def create_lib
+    `mkdir -p lib test`
+  end
+
+  def create_readme
+    `echo "# #{gem_name}" > README.md`
+  end
+
+  def create_license
+    Template.new('LICENSE', :year => Time.now.year, :author => user_name, :email => user_email).write
+  end
+
+  def create_gemfile
+    Template.new('Gemfile').write
+  end
+
+  def create_test_helper
+    Template.new('test/test_helper.rb').write
   end
 
-  def write_version
+  def create_version
     version = Version.new(options)
     if File.exists?("#{version.filename}")
-      say "Skipping #{version.filename}: already exists"
+      say "Skipping #{version.filename}: already exists" unless quiet?
     else
-      say "Creating #{version.filename}"
+      say "Creating #{version.filename}" unless quiet?
       version.write
     end
   end
 
-  def write_rakefile
+  def create_rakefile
     if File.exists?('Rakefile')
-      say "Skipping Rakefile: already exists"
+      say "Skipping Rakefile: already exists" unless quiet?
     else
+      say "Creating Rakefile" unless quiet?
       rakefile = <<RAKEFILE
 require 'rake'
 require 'rake/testtask'

data/lib/rubygems/commands/bump_command.rb

@@ -1,3 +1,4 @@
+require 'gem_release'
 require 'rubygems/commands/tag_command'
 require 'rubygems/commands/release_command'
 
@@ -7,20 +8,30 @@ class Gem::Commands::BumpCommand < Gem::Command
 
   attr_reader :arguments, :usage
 
-  OPTIONS = { :version => 'patch', :push => false, :tag => false, :release => false }
+  DEFAULTS = {
+    :version  => 'patch',
+    :push     => false,
+    :tag      => false,
+    :release  => false,
+    :commit   => true,
+    :quiet    => false
+  }
 
-  def initialize
-    super 'bump', 'Bump the gem version', OPTIONS
+  def initialize(options = {})
+    super 'bump', 'Bump the gem version', DEFAULTS.merge(options)
 
     option :version, '-v', 'Target version: next [major|minor|patch] or a given version number [x.x.x]'
+    option :commit,  '-c', 'Perform a commit after incrementing gem version'
     option :push,    '-p', 'Push to origin'
     option :tag,     '-t', 'Create a git tag and push --tags to origin'
     option :release, '-r', 'Build gem from a gemspec and push to rubygems.org'
+    option :quiet,   '-q', 'Do not output status messages'
   end
 
   def execute
-    bump
-    commit
+    in_spec_dirs { bump }
+
+    commit  if options[:commit]
     push    if options[:push] || options[:tag]
     release if options[:release]
     tag     if options[:tag]
@@ -28,19 +39,26 @@ class Gem::Commands::BumpCommand < Gem::Command
 
   protected
 
+    def in_spec_dirs
+      spec_dirs.each do |dir|
+        @version = nil
+        Dir.chdir(dir) { yield }
+      end
+    end
+
     def bump
-      say "Bumping from #{version.old_number} to version #{version.new_number}"
+      say "Bumping #{gem_name} from #{version.old_number} to version #{version.new_number}" unless quiet?
       version.bump!
     end
 
     def commit
-      say "Creating commit"
+      say "Creating commit" unless quiet?
       `git add #{version.filename}`
       `git commit -m "Bump to #{version.new_number}"`
     end
 
     def push
-      say "Pushing to origin"
+      say "Pushing to origin" unless quiet?
       `git push`
     end
 
@@ -55,4 +73,8 @@ class Gem::Commands::BumpCommand < Gem::Command
     def version
       @version ||= VersionFile.new(:target => options[:version])
     end
+
+    def spec_dirs
+      Dir.glob('**/*.gemspec').map { |spec| File.dirname(spec) }
+    end
 end

data/lib/rubygems/commands/gemspec_command.rb

@@ -2,22 +2,26 @@ class Gem::Commands::GemspecCommand < Gem::Command
   include GemRelease
   include Helpers, CommandOptions
 
-  OPTIONS = { :strategy => 'git' }
+  DEFAULTS = {
+    :strategy => 'git',
+    :quiet    => false
+  }
 
   attr_reader :arguments, :usage
 
-  def initialize
-    super 'bootstrap', 'Bootstrap a new gem source repository', OPTIONS
+  def initialize(options = {})
+    super 'bootstrap', 'Bootstrap a new gem source repository', DEFAULTS.merge(options)
 
     option :strategy, '-f', 'Strategy for collecting files [glob|git] in .gemspec'
+    option :quiet,    '-q', 'Do not output status messages'
   end
 
   def execute
     gemspec = Gemspec.new(options)
     if gemspec.exists?
-      say "Skipping #{gemspec.filename}: already exists"
+      say "Skipping #{gemspec.filename}: already exists" unless quiet?
     else
-      say "Creating #{gemspec.filename}"
+      say "Creating #{gemspec.filename}" unless quiet?
       gemspec.write
     end
   end

data/lib/rubygems/commands/release_command.rb

@@ -6,13 +6,19 @@ class Gem::Commands::ReleaseCommand < Gem::Command
   include GemRelease, Gem::Commands
   include Helpers, CommandOptions
 
-  OPTIONS = { :tag => false }
+  DEFAULTS = {
+    :tag   => false,
+    :quiet => false
+  }
 
   attr_reader :arguments, :usage
 
-  def initialize
-    super 'release', 'Build gem from a gemspec and push to rubygems.org'
-    option :tag, '-t', 'Create a git tag and push --tags to origin'
+  def initialize(options = {})
+    super 'release', 'Build gem from a gemspec and push to rubygems.org', DEFAULTS.merge(options)
+
+    option :tag,   '-t', 'Create a git tag and push --tags to origin'
+    option :quiet, '-q', 'Do not output status messages'
+
     @arguments = "gemspec - optional gemspec file name, will use the first *.gemspec if not specified"
     @usage = "#{program_name} [gemspec]"
   end
@@ -36,8 +42,8 @@ class Gem::Commands::ReleaseCommand < Gem::Command
     end
 
     def remove
+      say "Deleting left over gem file #{gem_filename}" unless quiet?
       `rm #{gem_filename}`
-      say "Deleting left over gem file #{gem_filename}"
     end
 
     def tag

data/lib/rubygems/commands/tag_command.rb

@@ -2,10 +2,16 @@ class Gem::Commands::TagCommand < Gem::Command
   include GemRelease
   include Helpers, CommandOptions
 
+  DEFAULTS = {
+    :quiet => false
+  }
+
   attr_reader :arguments, :usage
 
-  def initialize
-    super 'tag', 'Create a git tag and push --tags to origin'
+  def initialize(options = {})
+    super 'tag', 'Create a git tag and push --tags to origin', DEFAULTS.merge(options)
+
+    option :quiet, '-q', 'Do not output status messages'
   end
 
   def execute
@@ -16,12 +22,12 @@ class Gem::Commands::TagCommand < Gem::Command
   protected
 
     def tag
-      say "Creating git tag #{tag_name}"
+      say "Creating git tag #{tag_name}" unless quiet?
       `git tag -am 'tag #{tag_name}' #{tag_name}`
     end
 
     def push
-      say "Pushing --tags to origin git repository"
+      say "Pushing --tags to origin git repository" unless quiet?
       `git push --tags origin`
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-release
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 61
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +01:00
+date: 2011-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,9 +65,13 @@ files:
 - lib/gem_release/command_options.rb
 - lib/gem_release/gemspec.rb
 - lib/gem_release/helpers.rb
+- lib/gem_release/license.rb
 - lib/gem_release/template.rb
-- lib/gem_release/templates/gemspec.erb
-- lib/gem_release/templates/version.erb
+- lib/gem_release/templates/Gemfile
+- lib/gem_release/templates/LICENSE
+- lib/gem_release/templates/gemspec
+- lib/gem_release/templates/test/test_helper.rb
+- lib/gem_release/templates/version.rb
 - lib/gem_release/version.rb
 - lib/gem_release/version_file.rb
 - lib/rubygems/commands/bootstrap_command.rb
@@ -108,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Release your ruby gems with ease