ggem 1.9.1 → 1.9.2

data/lib/ggem/gemspec.rb

@@ -1,85 +1,80 @@
 require "pathname"
 require "scmd"
 
-module GGem
-
-  class Gemspec
-
-    PUSH_HOST_META_KEY = "allowed_push_host"
-    DEFAULT_PUSH_HOST  = "https://rubygems.org".freeze
-    BUILD_TO_DIRNAME   = "pkg".freeze
-
-    attr_reader :path, :name, :version, :version_tag
-    attr_reader :gem_file_name, :gem_file, :push_host
-
-    def initialize(root_path)
-      @root = Pathname.new(File.expand_path(root_path))
-      raise NotFoundError unless @root.exist?
-      @path = Pathname.new(Dir[File.join(@root, "{,*}.gemspec")].first.to_s)
-      raise NotFoundError unless @path.exist?
-
-      @spec        = load_gemspec(@path)
-      @name        = @spec.name
-      @version     = @spec.version
-      @version_tag = "v#{@version}"
-
-      @gem_file_name  = "#{@name}-#{@version}.gem"
-      @gem_file       = File.join(BUILD_TO_DIRNAME, @gem_file_name)
-      @built_gem_path = @root.join(@gem_file)
-
-      @push_host = get_push_host(@spec)
-    end
-
-    def run_build_cmd
-      run_cmd("gem build --verbose #{@path}").tap do
-        gem_path = @root.join(@gem_file_name)
-        run_cmd("mkdir -p #{@built_gem_path.dirname}")
-        run_cmd("mv #{gem_path} #{@built_gem_path}")
-      end
-    end
-
-    def run_install_cmd
-      run_cmd("gem install #{@built_gem_path}")
-    end
+module GGem; end
+class GGem::Gemspec
+  PUSH_HOST_META_KEY = "allowed_push_host"
+  DEFAULT_PUSH_HOST  = "https://rubygems.org".freeze
+  BUILD_TO_DIRNAME   = "pkg".freeze
+
+  NotFoundError = Class.new(ArgumentError)
+  LoadError     = Class.new(ArgumentError)
+  CmdError      = Class.new(RuntimeError)
+
+  attr_reader :path, :name, :version, :version_tag
+  attr_reader :gem_file_name, :gem_file, :push_host
+
+  def initialize(root_path)
+    @root = Pathname.new(File.expand_path(root_path))
+    raise NotFoundError unless @root.exist?
+    @path = Pathname.new(Dir[File.join(@root, "{,*}.gemspec")].first.to_s)
+    raise NotFoundError unless @path.exist?
+
+    @spec        = load_gemspec(@path)
+    @name        = @spec.name
+    @version     = @spec.version
+    @version_tag = "v#{@version}"
+
+    @gem_file_name  = "#{@name}-#{@version}.gem"
+    @gem_file       = File.join(BUILD_TO_DIRNAME, @gem_file_name)
+    @built_gem_path = @root.join(@gem_file)
+
+    @push_host = get_push_host(@spec)
+  end
 
-    def run_push_cmd
-      run_cmd("gem push #{@built_gem_path} --host #{@push_host}")
+  def run_build_cmd
+    run_cmd("gem build --verbose #{@path}").tap do
+      gem_path = @root.join(@gem_file_name)
+      run_cmd("mkdir -p #{@built_gem_path.dirname}")
+      run_cmd("mv #{gem_path} #{@built_gem_path}")
     end
+  end
 
-    private
-
-    def run_cmd(cmd_string)
-      cmd = Scmd.new(cmd_string)
-      cmd.run
-      if !cmd.success?
-        raise CmdError, "#{cmd_string}\n" \
-                        "#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
-      end
-      [cmd_string, cmd.exitstatus, cmd.stdout]
-    end
+  def run_install_cmd
+    run_cmd("gem install #{@built_gem_path}")
+  end
 
-    def load_gemspec(path)
-      eval(path.read, TOPLEVEL_BINDING, path.expand_path.to_s)
-    rescue ScriptError, StandardError => e
-      original_line = e.backtrace.find{ |line| line.include?(path.to_s) }
-      msg = "There was a #{e.class} while loading #{path.basename}: \n#{e.message}"
-      msg << " from\n  #{original_line}" if original_line
-      msg << "\n"
-      raise LoadError, msg
-    end
+  def run_push_cmd
+    run_cmd("gem push #{@built_gem_path} --host #{@push_host}")
+  end
 
-    def get_push_host(spec)
-      ENV["GGEM_PUSH_HOST"] || get_meta(spec)[PUSH_HOST_META_KEY] || DEFAULT_PUSH_HOST
-    end
+  private
 
-    def get_meta(spec)
-      (spec.respond_to?(:metadata) ? spec.metadata : {}) || {}
+  def run_cmd(cmd_string)
+    cmd = Scmd.new(cmd_string)
+    cmd.run
+    if !cmd.success?
+      raise CmdError, "#{cmd_string}\n" \
+                      "#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
     end
+    [cmd_string, cmd.exitstatus, cmd.stdout]
+  end
 
-    NotFoundError = Class.new(ArgumentError)
-    LoadError     = Class.new(ArgumentError)
-    CmdError      = Class.new(RuntimeError)
+  def load_gemspec(path)
+    eval(path.read, TOPLEVEL_BINDING, path.expand_path.to_s)
+  rescue ScriptError, StandardError => e
+    original_line = e.backtrace.find{ |line| line.include?(path.to_s) }
+    msg = "There was a #{e.class} while loading #{path.basename}: \n#{e.message}"
+    msg << " from\n  #{original_line}" if original_line
+    msg << "\n"
+    raise LoadError, msg
+  end
 
+  def get_push_host(spec)
+    ENV["GGEM_PUSH_HOST"] || get_meta(spec)[PUSH_HOST_META_KEY] || DEFAULT_PUSH_HOST
   end
 
+  def get_meta(spec)
+    (spec.respond_to?(:metadata) ? spec.metadata : {}) || {}
+  end
 end

data/lib/ggem/git_repo.rb

@@ -1,60 +1,55 @@
 require "pathname"
 require "scmd"
 
-module GGem
+module GGem; end
+class GGem::GitRepo
+  NotFoundError = Class.new(ArgumentError)
+  CmdError      = Class.new(RuntimeError)
 
-  class GitRepo
+  attr_reader :path
 
-    attr_reader :path
+  def initialize(repo_path)
+    @path = Pathname.new(File.expand_path(repo_path))
+  end
 
-    def initialize(repo_path)
-      @path = Pathname.new(File.expand_path(repo_path))
+  def run_init_cmd
+    run_cmd("git init").tap do
+      run_cmd("git add --all && git add -f *.keep")
     end
+  end
 
-    def run_init_cmd
-      run_cmd("git init").tap do
-        run_cmd("git add --all && git add -f *.gitkeep")
-      end
-    end
+  def run_validate_clean_cmd
+    run_cmd("git diff --exit-code")
+  end
 
-    def run_validate_clean_cmd
-      run_cmd("git diff --exit-code")
-    end
+  def run_validate_committed_cmd
+    run_cmd("git diff-index --quiet --cached HEAD")
+  end
 
-    def run_validate_committed_cmd
-      run_cmd("git diff-index --quiet --cached HEAD")
+  def run_push_cmd
+    run_cmd("git push").tap do
+      run_cmd("git push --tags")
     end
+  end
 
-    def run_push_cmd
-      run_cmd("git push").tap do
-        run_cmd("git push --tags")
-      end
-    end
+  def run_add_version_tag_cmd(version, tag)
+    run_cmd("git tag -a -m \"Version #{version}\" #{tag}")
+  end
 
-    def run_add_version_tag_cmd(version, tag)
-      run_cmd("git tag -a -m \"Version #{version}\" #{tag}")
-    end
+  def run_rm_tag_cmd(tag)
+    run_cmd("git tag -d #{tag}")
+  end
 
-    def run_rm_tag_cmd(tag)
-      run_cmd("git tag -d #{tag}")
-    end
+  private
 
-    private
-
-    def run_cmd(cmd_string)
-      cmd_string = "cd #{@path} && #{cmd_string}"
-      cmd = Scmd.new(cmd_string)
-      cmd.run
-      if !cmd.success?
-        raise CmdError, "#{cmd_string}\n" \
-                        "#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
-      end
-      [cmd_string, cmd.exitstatus, cmd.stdout]
+  def run_cmd(cmd_string)
+    cmd_string = "cd #{@path} && #{cmd_string}"
+    cmd = Scmd.new(cmd_string)
+    cmd.run
+    if !cmd.success?
+      raise CmdError, "#{cmd_string}\n" \
+                      "#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
     end
-
-    NotFoundError = Class.new(ArgumentError)
-    CmdError      = Class.new(RuntimeError)
-
+    [cmd_string, cmd.exitstatus, cmd.stdout]
   end
-
 end

data/lib/ggem/template.rb

@@ -1,70 +1,62 @@
 require "erb"
 require "fileutils"
 
-module GGem
-
-  class Template
-
-    def initialize(ggem)
-      @gem = ggem
-    end
-
-    def save
-      save_folder # (gem root path)
-      save_folder ".circleci"
-      save_folder "lib/#{@gem.ruby_name}"
-      save_folder "test/support"
-      save_folder "test/system"
-      save_folder "test/unit"
-      save_folder "log"
-      save_folder "tmp"
-
-      save_file("circleci_config.yml.erb", ".circleci/config.yml")
-
-      save_file("ruby-version.erb", ".ruby-version")
-      save_file("gitignore.erb", ".gitignore")
-      save_file("Gemfile.erb",   "Gemfile")
-      save_file("gemspec.erb",   "#{@gem.name}.gemspec")
-      save_file("README.md.erb", "README.md")
-      save_file("LICENSE.erb",   "LICENSE")
-
-      save_file("lib.rb.erb",         "lib/#{@gem.ruby_name}.rb")
-      save_file("lib_version.rb.erb", "lib/#{@gem.ruby_name}/version.rb")
-
-      save_file("test_helper.rb.erb",          "test/helper.rb")
-      save_file("test_support_factory.rb.erb", "test/support/factory.rb")
+module GGem; end
+class GGem::Template
+  def initialize(ggem)
+    @ggem = ggem
+  end
 
-      save_empty_file("log/.gitkeep")
-      save_empty_file("test/system/.gitkeep")
-      save_empty_file("test/unit/.gitkeep")
-      save_empty_file("tmp/.gitkeep")
-    end
+  def save
+    save_folder # (gem root path)
+    save_folder "lib/#{@ggem.ruby_name}"
+    save_folder "test/support"
+    save_folder "test/system"
+    save_folder "test/unit"
+    save_folder "log"
+    save_folder "tmp"
+
+    save_file("ruby-version.erb", ".ruby-version")
+    save_file("gitignore.erb", ".gitignore")
+    save_file("Gemfile.erb",   "Gemfile")
+    save_file("gemspec.erb",   "#{@ggem.name}.gemspec")
+    save_file("README.md.erb", "README.md")
+    save_file("LICENSE.erb",   "LICENSE")
+
+    save_file("lib.rb.erb",         "lib/#{@ggem.ruby_name}.rb")
+    save_file("lib_version.rb.erb", "lib/#{@ggem.ruby_name}/version.rb")
+
+    save_file("test_helper.rb.erb",          "test/helper.rb")
+    save_file("test_support_factory.rb.erb", "test/support/factory.rb")
+
+    save_empty_file("log/.keep")
+    save_empty_file("test/system/.keep")
+    save_empty_file("test/unit/.keep")
+    save_empty_file("tmp/.keep")
+  end
 
-    private
+  private
 
-    def save_folder(relative_path=nil)
-      path = File.join([@gem.path, relative_path].compact)
-      FileUtils.mkdir_p(path)
-    end
+  def save_folder(relative_path=nil)
+    path = File.join([@ggem.path, relative_path].compact)
+    FileUtils.mkdir_p(path)
+  end
 
-    def save_empty_file(relative_path)
-      path = File.join(@gem.path, relative_path)
-      FileUtils.touch(path)
-    end
+  def save_empty_file(relative_path)
+    path = File.join(@ggem.path, relative_path)
+    FileUtils.touch(path)
+  end
 
-    def save_file(source, output)
-      source_file = File.join(File.dirname(__FILE__), "template_file", source)
-      output_file = File.join(@gem.root_path, @gem.name, output)
+  def save_file(source, output)
+    source_file = File.join(File.dirname(__FILE__), "template_file", source)
+    output_file = File.join(@ggem.root_path, @ggem.name, output)
 
-      if File.exists?(source_file)
-        FileUtils.mkdir_p(File.dirname(output_file))
-        erb = ERB.new(File.read(source_file))
-        File.open(output_file, "w") {|f| f << erb.result(binding) }
-      else
-        raise ArgumentError, "the source file `#{source_file}` does not exist"
-      end
+    if File.exists?(source_file)
+      FileUtils.mkdir_p(File.dirname(output_file))
+      erb = ERB.new(File.read(source_file))
+      File.open(output_file, "w") {|f| f << erb.result(binding) }
+    else
+      raise ArgumentError, "the source file `#{source_file}` does not exist"
     end
-
   end
-
 end

data/lib/ggem/template_file/Gemfile.erb

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-ruby '> 1.8'
+ruby "~> 2.5"
 
 gemspec
 
-gem "pry", "~> 0.11.3"
+gem "pry", "~> 0.12.2"

data/lib/ggem/template_file/README.md.erb

@@ -1,4 +1,4 @@
-# <%= @gem.module_name %>
+# <%= @ggem.module_name %>
 
 TODO: Write a gem description
 
@@ -10,7 +10,7 @@ TODO: Write code samples and usage instructions here
 
 Add this line to your application's Gemfile:
 
-    gem "<%= @gem.name %>"
+    gem "<%= @ggem.name %>"
 
 And then execute:
 
@@ -18,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install <%= @gem.name %>
+    $ gem install <%= @ggem.name %>
 
 ## Contributing
 

data/lib/ggem/template_file/gemspec.erb

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "<%= @gem.ruby_name %>/version"
+require "<%= @ggem.ruby_name %>/version"
 
 Gem::Specification.new do |gem|
-  gem.name        = "<%= @gem.name %>"
-  gem.version     = <%= @gem.module_name %>::VERSION
+  gem.name        = "<%= @ggem.name %>"
+  gem.version     = <%= @ggem.module_name %>::VERSION
   gem.authors     = ["TODO: authors"]
   gem.email       = ["TODO: emails"]
   gem.summary     = "TODO: Write a gem summary"
@@ -18,10 +18,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '> 1.8'
+  gem.required_ruby_version = "~> 2.5"
 
-  gem.add_development_dependency("assert", ["~> 2.17.0"])
+  gem.add_development_dependency("assert", ["~> 2.18.2"])
 
   # TODO: gem.add_dependency("gem-name", ["~> 0.0.0"])
-
 end

data/lib/ggem/template_file/lib.rb.erb

@@ -1,5 +1,5 @@
-require "<%= @gem.ruby_name %>/version"
+require "<%= @ggem.ruby_name %>/version"
 
-module <%= @gem.module_name %>
+module <%= @ggem.module_name %>
   # TODO: your code goes here...
 end

data/lib/ggem/template_file/lib_version.rb.erb

@@ -1,3 +1,3 @@
-module <%= @gem.module_name %>
+module <%= @ggem.module_name %>
   VERSION = "0.0.1"
 end

data/lib/ggem/template_file/ruby-version.erb

@@ -1 +1 @@
-2.3.7
+2.5.5