gemplate 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5a16e79a6f8f2d1f2c03bc8874f5123f0881ab
-  data.tar.gz: f76157f458ce552ca27ded77611df91f2037eefd
+  metadata.gz: 5ab8d805386162f2bcd34bb9894e45b53b5dba99
+  data.tar.gz: a3691e3870fb55acc31649bf7193f867f310b711
 SHA512:
-  metadata.gz: 42e0e47defbb3fc84ace865030d3a7d6ebeca7daa8a4b1d6df308c24bd50b1e68df81fbc37d37eee125576cb47732aa559d36229301d2bffebb174ff539760cc
-  data.tar.gz: ce34c6ee232993a40663c882b3ed236332e9877be89d4b804c3056077da2f5bc0e8dcb17d766e5dcf30d3d15b099369e68984fdf6f8c22e5bbe7ff302f979787
+  metadata.gz: 37b24362c21916c73d7e0fc564435e0074a5deb137412a083ce50ee63e6d8e398a36762b6beb763ae9033a80271020dbae892749c7527727ff10fe1fb86bd4e3
+  data.tar.gz: 825790cbbf44693a76b93e632a47677c505c2f84b53c16f19c9409d6608c5446061ae33baa1300a0a889122ad8d92f2d753672994860cd3a38a512a1fbad98eb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.0.0 / 2015-11-05
+
+* [FEATURE] Switch to Mercenary for better CLI interaction
+* [ENHANCEMENT] Add --skip flag to skip GitHub steps
+
 # 1.1.0 / 2015-09-21
 
 * [FEATURE] Replace TravisCI with CircleCI

data/bin/gemplate

@@ -4,41 +4,67 @@ require 'gemplate'
 require 'userinput'
 require 'rugged'
 require 'curb'
+require 'mercenary'
 
-name = ARGV.first
-name = UserInput.new(message: 'Gem name', default: name).ask
+Mercenary.program(:gemplate) do |p|
+  p.version Gemplate::VERSION
+  p.description 'Tool for bootstrapping new gems'
+  p.syntax 'gemplate [options] GEM_NAME'
 
-user = Rugged::Config.global['github.user'] || ENV['USER']
-user = UserInput.new(message: 'GitHub username', default: user).ask
+  p.option :user, '-u', '--user', 'GitHub username'
+  p.option :org, '-o', '--org', 'GitHub organization'
+  p.option :full_name, '-n', '--name', 'Full name'
+  p.option :email, '-e', '--email', 'Email address'
+  p.option :license, '-l', '--license', 'License'
+  p.option :skip_github, '-s', '--skip', 'Skip GitHub steps'
 
-org = user
-org = UserInput.new(message: 'GitHub organization', default: org).ask
+  p.action do |_, options|
+    options[:name] = ARGV.first || UserInput.new(message: 'Gem name').ask
 
-full_name = Rugged::Config.global['user.name']
-full_name = UserInput.new(message: 'Full name', default: full_name).ask
+    unless options[:user]
+      options[:user] = Rugged::Config.global['github.user'] || ENV['USER']
+      options[:user] = UserInput.new(
+        message: 'GitHub username', default: user
+      ).ask
+    end
 
-email = Rugged::Config.global['user.email']
-email = UserInput.new(message: 'Email address', default: email).ask
+    unless options[:org]
+      options[:org] = user
+      options[:org] = UserInput.new(
+        message: 'GitHub organization', default: org
+      ).ask
+    end
 
-license_validation = proc do |lname|
-  url = "https://raw.githubusercontent.com/akerl/licenses/master/#{lname}.txt"
-  Curl::Easy.http_head(url).response_code == 200
-end
+    unless options[:full_name]
+      options[:full_name] = Rugged::Config.global['user.name']
+      options[:full_name] = UserInput.new(
+        message: 'Full name', default: full_name
+      ).ask
+    end
+
+    unless options[:email]
+      options[:email] = Rugged::Config.global['user.email']
+      options[:email] = UserInput.new(
+        message: 'Email address', default: email
+      ).ask
+    end
+
+    license_validation = proc do |x|
+      url = "https://raw.githubusercontent.com/akerl/licenses/master/#{x}.txt"
+      Curl::Easy.http_head(url).response_code == 200
+    end
 
-puts 'Available licenses can be found here: https://github.com/akerl/licenses'
-license = UserInput.new(
-  message: 'License',
-  default: 'MIT',
-  validation: license_validation
-).ask
-
-Gemplate.new(
-  name: name,
-  user: user,
-  org: org,
-  full_name: full_name,
-  email: email,
-  license: license
-).create
-
-puts 'New gem has been created!'
+    unless options[:license]
+      puts 'List of licenses: https://github.com/akerl/licenses'
+      options[:license] = UserInput.new(
+        message: 'License',
+        default: 'MIT',
+        validation: license_validation
+      ).ask
+    end
+
+    Gemplate.new(options).create
+
+    puts 'New gem has been created!'
+  end
+end

data/gemplate.gemspec

@@ -1,6 +1,9 @@
+$:.unshift File.expand_path('../lib/', __FILE__)
+require 'gemplate/version'
+
 Gem::Specification.new do |s|
   s.name        = 'gemplate'
-  s.version     = '1.1.2'
+  s.version     = Gemplate::VERSION
   s.date        = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'Bootstrap tool for making gems'
@@ -19,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'octoauth', '~> 1.3.0'
   s.add_dependency 'octokit', '~> 4.1.0'
   s.add_dependency 'curb', '~> 0.8.6'
+  s.add_dependency 'mercenary', '~> 0.3.4'
 
   s.add_development_dependency 'rubocop', '~> 0.34.0'
   s.add_development_dependency 'rake', '~> 10.4.0'
@@ -26,5 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.3.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'
   s.add_development_dependency 'webmock', '~> 1.22.0'
-  s.add_development_dependency 'vcr', '~> 2.9.2'
+  s.add_development_dependency 'vcr', '~> 3.0.0'
 end

data/lib/gemplate.rb

@@ -1,10 +1,3 @@
-require 'rugged'
-require 'pathname'
-require 'fileutils'
-require 'curb'
-require 'octoauth'
-require 'octokit'
-
 ##
 # Bootstrap tool for new gems
 module Gemplate
@@ -16,101 +9,7 @@ module Gemplate
       self::Gem.new(*args)
     end
   end
-
-  TEMPLATE = "#{Pathname.new(__FILE__).parent.parent}/template"
-  LICENSE_URL = 'https://raw.githubusercontent.com/akerl/licenses/master'
-
-  ##
-  # Gem directory object
-  class Gem
-    def initialize(params = {})
-      @name = params[:name]
-      @user = params[:user]
-      @org = params[:org]
-      @full_name = params[:full_name]
-      @email = params[:email]
-      @license = params[:license]
-      @authfile = params[:authfile] || :default
-    end
-
-    def create
-      create_directory
-      Dir.chdir @name
-      add_license
-      process_templates
-      adjust_files
-      make_repo
-      Dir.chdir '..'
-    end
-
-    private
-
-    def create_directory
-      fail "#{@name} already exists" if File.exist? @name
-      FileUtils.cp_r TEMPLATE, @name
-    end
-
-    def dependencies
-      source = "#{TEMPLATE}/../gemplate.gemspec"
-      File.read(source).lines.select { |x| x.include? 's.add_dev' }.join.strip
-    end
-
-    def add_license
-      url = "#{LICENSE_URL}/#{@license}.txt"
-      File.open('LICENSE', 'w') do |fh|
-        license = Curl::Easy.perform(url)
-        if license.response_code == 404
-          fail ArgumentError, 'Invalid license name provided'
-        end
-        fh.write license.body_str
-      end
-    end
-
-    def replacements
-      [
-        [/AUTHOR_NAME/, @user],
-        [/LICENSE_NAME/, @license],
-        [/FULL_NAME/, @full_name],
-        [/REPO_NAME/, @name],
-        [/EMAIL_ADDRESS/, @email],
-        [/CURRENT_YEAR/, Time.now.strftime('%Y')],
-        [/#DEV_DEPS/, dependencies]
-      ]
-    end
-
-    def process_templates
-      Dir.glob('**/*', File::FNM_DOTMATCH).each do |path|
-        next unless File.file? path
-        text = File.read path
-        replacements.each { |regex, new| text.gsub! regex, new }
-        File.open(path, 'w') { |fh| fh.write text }
-      end
-    end
-
-    def adjust_files
-      moves = [['REPO_NAME.gemspec', "#{@name}.gemspec"],
-               ['lib/REPO_NAME.rb', "lib/#{@name}.rb"],
-               ['spec/REPO_NAME_spec.rb', "spec/#{@name}_spec.rb"]]
-      moves.each { |original, new| FileUtils.move original, new }
-    end
-
-    def make_repo
-      Rugged::Repository.init_at '.'
-      `git remote add origin "git@github.com:#{org || @user}/#{@name}"`
-      `git config branch.master.remote origin`
-      `git config branch.master.merge refs/heads/master`
-      github_api.create_repo(@name, organization: org, has_wiki: false)
-    end
-
-    def org
-      @org == @user ? nil : @org
-    end
-
-    def github_api
-      return @api_client if @api_client
-      auth = Octoauth.new note: 'gemplate', scopes: ['repo'], file: @authfile
-      auth.save
-      @api_client = Octokit::Client.new(access_token: auth.token)
-    end
-  end
 end
+
+require 'gemplate/gem'
+require 'gemplate/version'

data/lib/gemplate/gem.rb

@@ -0,0 +1,109 @@
+require 'rugged'
+require 'pathname'
+require 'fileutils'
+require 'curb'
+require 'octoauth'
+require 'octokit'
+
+##
+# Bootstrap tool for new gems
+module Gemplate
+  TEMPLATE = "#{Pathname.new(__FILE__).parent.parent.parent}/template"
+  LICENSE_URL = 'https://raw.githubusercontent.com/akerl/licenses/master'
+
+  ##
+  # Gem directory object
+  class Gem
+    def initialize(params = {})
+      @name = params[:name]
+      @user = params[:user]
+      @org = params[:org]
+      @full_name = params[:full_name]
+      @email = params[:email]
+      @license = params[:license]
+      @authfile = params[:authfile] || :default
+      @skip_github = params[:skip_github]
+    end
+
+    def create
+      create_directory
+      Dir.chdir @name
+      add_license
+      process_templates
+      adjust_files
+      make_repo
+      Dir.chdir '..'
+    end
+
+    private
+
+    def create_directory
+      fail "#{@name} already exists" if File.exist? @name
+      FileUtils.cp_r TEMPLATE, @name
+    end
+
+    def dependencies
+      source = "#{TEMPLATE}/../gemplate.gemspec"
+      File.read(source).lines.select { |x| x.include? 's.add_dev' }.join.strip
+    end
+
+    def add_license
+      url = "#{LICENSE_URL}/#{@license}.txt"
+      File.open('LICENSE', 'w') do |fh|
+        license = Curl::Easy.perform(url)
+        if license.response_code == 404
+          fail ArgumentError, 'Invalid license name provided'
+        end
+        fh.write license.body_str
+      end
+    end
+
+    def replacements
+      [
+        [/AUTHOR_NAME/, @user],
+        [/LICENSE_NAME/, @license],
+        [/FULL_NAME/, @full_name],
+        [/REPO_NAME/, @name],
+        [/EMAIL_ADDRESS/, @email],
+        [/CURRENT_YEAR/, Time.now.strftime('%Y')],
+        [/#DEV_DEPS/, dependencies]
+      ]
+    end
+
+    def process_templates
+      Dir.glob('**/*', File::FNM_DOTMATCH).each do |path|
+        next unless File.file? path
+        text = File.read path
+        replacements.each { |regex, new| text.gsub! regex, new }
+        File.open(path, 'w') { |fh| fh.write text }
+      end
+    end
+
+    def adjust_files
+      moves = [['REPO_NAME.gemspec', "#{@name}.gemspec"],
+               ['lib/REPO_NAME.rb', "lib/#{@name}.rb"],
+               ['spec/REPO_NAME_spec.rb', "spec/#{@name}_spec.rb"]]
+      moves.each { |original, new| FileUtils.move original, new }
+    end
+
+    def make_repo
+      Rugged::Repository.init_at '.'
+      return if @skip_github
+      `git remote add origin "git@github.com:#{org || @user}/#{@name}"`
+      `git config branch.master.remote origin`
+      `git config branch.master.merge refs/heads/master`
+      github_api.create_repo(@name, organization: org, has_wiki: false)
+    end
+
+    def org
+      @org == @user ? nil : @org
+    end
+
+    def github_api
+      return @api_client if @api_client
+      auth = Octoauth.new note: 'gemplate', scopes: ['repo'], file: @authfile
+      auth.save
+      @api_client = Octokit::Client.new(access_token: auth.token)
+    end
+  end
+end

data/lib/gemplate/version.rb

@@ -0,0 +1,5 @@
+##
+# Declare version of module
+module Gemplate
+  VERSION = '2.0.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemplate
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
+- !ruby/object:Gem::Dependency
+  name: mercenary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.0.0
 description: Creates a basic repository layout for a new gem
 email: me@lesaker.org
 executables:
@@ -198,6 +212,8 @@ files:
 - circle.yml
 - gemplate.gemspec
 - lib/gemplate.rb
+- lib/gemplate/gem.rb
+- lib/gemplate/version.rb
 - spec/creds.yml
 - spec/fixtures/cassettes/bad_license.yml
 - spec/fixtures/cassettes/subject_create.yml
@@ -235,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Bootstrap tool for making gems