toys 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddcf431eae87a4ef5781ee240d99dca2bf39b9ec3d4f2343158c4f1a3e593078
-  data.tar.gz: b7b0fb7173d9e58c42814def124141af2383024c982a30096773dc835718f57c
+  metadata.gz: 562abaf505246d6b3a84c800908b19cfe9acbc6a57d5432bceccac31eaa107ef
+  data.tar.gz: 39efb6120be94eeb4479e8ae4fe782d796a49e5dcfd4e837735dd69986e3cfb4
 SHA512:
-  metadata.gz: 5dc3a473a1a2288cfc58f928629d491c4227d73a9765aae48b4384fee391999d4e096fd1fc46a1eb3290a982877a46028c5279c6ed3d863e95b11d6f6a916249
-  data.tar.gz: 378aa6465225148659697d6c4c4b75720c6f182c7539b7ef922da601fac94d5ad950a50265452d4439e9c178744b3d4906ec22d9319d444fd4c8163ac97396a0
+  metadata.gz: fe6196e43402bce7c7e916dcc75906e5b420ce1882ed0ca6104b6f0a54c6263feba8bf2284c1e8b8d2ca783ed1dacb291078622912f84483628b9f003397ca9e
+  data.tar.gz: bd24a58dcdc1fd2f34c50b97d57129e031f17aaa77044af1c6b62a86d67a1ba32506d3234156cb66576f282de82953e95cf52460fc409f86a82ff5d6c64e42de

data/lib/toys.rb

@@ -6,5 +6,6 @@ require "toys/context"
 require "toys/errors"
 require "toys/lookup"
 require "toys/parser"
+require "toys/template"
 require "toys/tool"
 require "toys/version"

data/lib/toys/builtins/system.rb

@@ -1,9 +1,39 @@
 short_desc "A collection of system commands for toys"
 long_desc "A collection of system commands for toys"
 
+
 name "version" do
+
   short_desc "Print current toys version"
+
   execute do
     puts Toys::VERSION
   end
+
+end
+
+
+name "update" do
+
+  short_desc "Update toys if a newer version is available"
+
+  helper_module :exec
+
+  execute do
+    version_info = capture("gem query -q -r -e toys")
+    if version_info =~ /toys\s\((.+)\)/
+      latest_version = Gem::Version.new($1)
+      cur_version = Gem::Version.new(Toys::VERSION)
+      if latest_version > cur_version
+        logger.warn("Updating toys from #{cur_version} to #{latest_version}...")
+        sh("gem install toys")
+      else
+        logger.warn("Toys is already at the latest version: #{latest_version}")
+      end
+    else
+      logger.error("Could not get latest toys version")
+      exit(1)
+    end
+  end
+
 end

data/lib/toys/context.rb

@@ -25,7 +25,7 @@ module Toys
       tool.execute(self, args.slice(tool.full_name.length..-1))
     end
 
-    def exit_with_code(code)
+    def exit(code)
       throw :result, code
     end
 

data/lib/toys/helpers/exec.rb

@@ -40,7 +40,7 @@ module Toys
 
         def handle_status(status)
           if status != 0 && @config[:report_subprocess_errors]
-            @context.exit_with_code(status)
+            @context.exit(status)
           end
           status
         end

data/lib/toys/helpers/file_utils.rb

@@ -0,0 +1,7 @@
+require "fileutils"
+
+module Toys
+  module Helpers
+    FileUtils = ::FileUtils
+  end
+end

data/lib/toys/parser.rb

@@ -60,6 +60,20 @@ module Toys
       self
     end
 
+    def expand(template, opts={})
+      if template.is_a?(Symbol)
+        template = template.to_s
+        file_name = template.gsub(/([a-zA-Z])([A-Z])/){ |m| "#{$1}_#{$2.downcase}" }.downcase
+        require "toys/templates/#{file_name}"
+        const_name = template.gsub(/(^|_)([a-zA-Z0-9])/){ |m| $2.upcase }
+        template = Toys::Templates.const_get(const_name)
+      end
+      opts = template.opts_initializer.call(opts)
+      yield opts if block_given?
+      instance_exec(opts, &template.expander)
+      self
+    end
+
     def long_desc(desc)
       @tool.long_desc = desc
       self

data/lib/toys/template.rb

@@ -0,0 +1,21 @@
+module Toys
+  class Template
+    def initialize
+      @opts_initializer = ->(opts){opts}
+      @expander = ->(opts){}
+    end
+
+    def to_init_opts(&block)
+      @opts_initializer = block
+      self
+    end
+
+    def to_expand(&block)
+      @expander = block
+      self
+    end
+
+    attr_reader :opts_initializer
+    attr_reader :expander
+  end
+end

data/lib/toys/templates/gem_build.rb

@@ -0,0 +1,63 @@
+require "rubygems/package"
+
+module Toys
+  module Templates
+    GemBuild = Toys::Template.new
+
+    GemBuild.to_init_opts do |opts|
+      {
+        name: "build",
+        gem_name: nil,
+        push_gem: false,
+        tag: false,
+        push_tag: false
+      }.merge(opts)
+    end
+
+    GemBuild.to_expand do |opts|
+      toy_name = opts[:name] || "build"
+      gem_name = opts[:gem_name]
+      unless gem_name
+        candidates = ::Dir.glob("*.gemspec")
+        if candidates.size > 0
+          gem_name = candidates.first.sub(/\.gemspec$/, "")
+        else
+          raise Toys::ToysDefinitionError, "Could not find a gemspec"
+        end
+      end
+      push_gem = opts[:push_gem]
+      tag = opts[:tag]
+      push_tag = opts[:push_tag]
+
+      name toy_name do
+        short_desc "#{push_gem ? 'Release' : 'Build'} the gem: #{gem_name}"
+
+        helper_module :file_utils
+        helper_module :exec
+
+        execute do
+          gemspec = Gem::Specification.load "#{gem_name}.gemspec"
+          version = gemspec.version
+          gemfile = "#{gem_name}-#{version}.gem"
+          Gem::Package.build gemspec
+          mkdir_p "pkg"
+          mv gemfile, "pkg"
+          if push_gem
+            if File.directory?(".git") && capture("git status -s").strip != ""
+              logger.error "Cannot push the gem when there are uncommited changes"
+              exit(1)
+            end
+            sh "gem push pkg/#{gemfile}", report_subprocess_errors: true
+            if tag
+              sh "git tag v#{version}", report_subprocess_errors: true
+              if push_tag
+                push_tag = "origin" if push_tag == true
+                sh "git push #{push_tag} v#{version}", report_subprocess_errors: true
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toys/templates/minitest.rb

@@ -0,0 +1,41 @@
+require "shellwords"
+
+module Toys
+  module Templates
+    Minitest = Toys::Template.new
+
+    Minitest.to_init_opts do |opts|
+      {
+        name: "test",
+        libs: ["lib", "test"],
+        test_files: [],
+        warning: true
+      }.merge(opts)
+    end
+
+    Minitest.to_expand do |opts|
+      toy_name = opts[:name] || "build"
+      libs = opts[:libs] || []
+      warning = opts[:warning]
+      test_files = opts[:test_files] || []
+      lib_path = libs.join(File::PATH_SEPARATOR)
+      cmd = []
+      cmd << File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
+      cmd << "-I#{lib_path}" unless libs.empty?
+      cmd << "-w" if warning
+      cmd << "-e" << "ARGV.each{|f| load f}"
+      cmd << "--"
+      cmd = Shellwords.join(cmd + test_files)
+
+      name toy_name do
+        short_desc "Run minitest"
+
+        helper_module :exec
+
+        execute do
+          sh(cmd, report_subprocess_errors: true)
+        end
+      end
+    end
+  end
+end

data/lib/toys/tool.rb

@@ -156,7 +156,7 @@ module Toys
         mod = mod.to_s
         file_name = mod.gsub(/([a-zA-Z])([A-Z])/){ |m| "#{$1}_#{$2.downcase}" }.downcase
         require "toys/helpers/#{file_name}"
-        const_name = mod.gsub(/_([a-zA-Z0-9])/){ |m| $1.upcase }.capitalize
+        const_name = mod.gsub(/(^|_)([a-zA-Z0-9])/){ |m| $2.upcase }
         @modules << Toys::Helpers.const_get(const_name)
       when String
         @modules << mod

data/lib/toys/version.rb

@@ -1,3 +1,3 @@
 module Toys
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: Command line tool framework
+description: A simple command line tool framework
 email:
 - dazuma@gmail.com
 executables:
@@ -123,8 +123,12 @@ files:
 - lib/toys/context.rb
 - lib/toys/errors.rb
 - lib/toys/helpers/exec.rb
+- lib/toys/helpers/file_utils.rb
 - lib/toys/lookup.rb
 - lib/toys/parser.rb
+- lib/toys/template.rb
+- lib/toys/templates/gem_build.rb
+- lib/toys/templates/minitest.rb
 - lib/toys/tool.rb
 - lib/toys/version.rb
 homepage: https://github.com/dazuma/toys