toki 0.0.1 → 0.0.2

data/README.md

@@ -35,10 +35,10 @@ class Example
   end
 
   # any mri version of ruby that is 1.9 or later
-  when_ruby :version => /^((?!1\.[0-8]).*?)$/, :engine => 'ruby' do
+  when_ruby :engine => 'ruby', :version => /^((?!1\.[0-8]).*?)$/ do
     # also class methods can be defined
     def self.ping
-      "PONG"
+      "gnop"
     end
     # applied only if ruby 1.9.x or later; overwrites array_to_string method
     # ruby 2.0.0 # => "123"
@@ -48,13 +48,16 @@ class Example
   end
 
   # applied only if version and patchlevel matches
-  when_ruby :version  => '1.8.7',   :patchlevel       => '371'    do; end
+  when_ruby :version => '1.8.7',    :patchlevel       => '371'    do; end
 
   # applied only if engine and version matches
-  when_ruby :engine   => 'ruby',    :version          => '1.8.7'  do; end
-  when_ruby :engine   => 'jruby',   :jruby_version    => '1.7.6'  do; end
-  when_ruby :engine   => 'macruby', :macruby_version  => '0.12'   do; end
-  when_ruby :engine   => 'rbx',     :rbx_version      => '2.1.1'  do; end
+  when_ruby :engine  => 'ruby',     :version          => '1.8.7'  do; end
+  when_ruby :engine  => 'jruby',    :jruby_version    => '1.7.6'  do; end
+  when_ruby :engine  => 'macruby',  :macruby_version  => '0.12'   do; end
+  when_ruby :engine  => 'rbx',      :rbx_version      => '2.1.1'  do; end
+  when_ruby :engine  => 'maglev',   :maglev_version   => '1.1RC1' do; end
+  when_ruby :engine  => 'ironruby', :ironruby_version => '1.1.3'  do; end
+  when_ruby :engine  => 'kiji',     :kiji_version     => '0.11'   do; end
 
   # applied only if platform matches; :windows, :osx, :linux, :unix, :unknown
   when_ruby :platform => :linux         do; end
@@ -65,18 +68,21 @@ class Example
   when_jruby_version    '1.7.6'         do; end
   when_macruby_version  '0.12'          do; end
   when_rbx_version      '2.1.1'         do; end
+  when_maglev_version   '1.1RC1'        do; end
+  when_ironruby_version '1.1.3'         do; end
+  when_kiji_version     '0.11'          do; end
   when_ruby_patchlevel  '371'           do; end
   when_ruby_engine      'rbx'           do; end
   when_platform         :osx            do; end
 
 end
 
-# 1.8.7
-puts Example.ping                 # => 'pong'
+# MRI 1.8.7
+puts Example.ping                 # => "pong"
 puts Example.new.array_to_string  # => "123"
 
-# 2.0.0
-puts Example.ping                 # => 'gnop'
+# MRI 2.0.0
+puts Example.ping                 # => "gnop"
 puts Example.new.array_to_string  # => "123"
 ```
 
@@ -87,3 +93,28 @@ puts Example.new.array_to_string  # => "123"
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+
+Copyright (c) 2013 Jussi Koljonen
+
+MIT License
+
+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/bin/git-release

@@ -0,0 +1,174 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# -*- warn-indent: true -*-
+require 'time'
+require 'optparse'
+
+bump_version  = true
+old_version   = nil
+new_version   = nil
+
+def git_config_value(tag)
+  `/usr/bin/env git config --get-all #{tag}`.chop
+end
+
+def git_rev_parse(command)
+  `git rev-parse #{command}`.chop
+end
+
+def exec(command)
+  system("/usr/bin/env #{command}")
+end
+
+def git_directory
+  git_rev_parse('--git-dir')
+end
+
+def git_toplevel_directory
+  git_rev_parse('--show-toplevel')
+end
+
+def commit_message
+  File.read(File.join(git_directory, 'COMMIT_EDITMSG')).split("\n").select do | line |
+    line !~ /^#/
+  end
+end
+
+def update_changelog(message)
+  changelog_file = File.join(git_toplevel_directory, 'changelog')
+  if File.exists?(changelog_file)
+    changelog = message + "\n" + File.read(changelog_file)
+    add_file = false
+  else
+    changelog = message
+    add_file = true
+  end
+  # write changelog file
+  File.open(changelog_file, 'w') do | file |
+    file << changelog
+  end
+  # add file to git repository
+  if add_file 
+    `git add #{changelog_file}`
+  end
+end
+
+def version_number
+  File.read(File.join(git_toplevel_directory, 'version')).gsub(/[\n\r]/, '')
+end
+
+def bump_version(version, release_type)
+  # parse current version number
+  version = version.split('.').map(&:to_i)
+  # major.minor.patch(.build)
+  while version.size < 3
+    version << 0
+  end
+  case release_type
+  when :major
+    # major.0.0
+    version[0] = version[0].succ
+    version[1] = 0
+    version[2] = 0
+  when :minor
+    # major.minor.0
+    version[1] = version[1].succ
+    version[2] = 0
+  when :patch
+    # major.minor.patch
+    version[2] = version[2].succ
+  else
+    abort "Unsupported release type #{release_type.inspect}"
+  end
+  # version as string
+  version = version.join('.')
+  # update version file
+  File.open('version', 'w') do | file |
+    file << version
+  end
+  # return new version number
+  version
+end
+
+def read_project_name
+  File.read(File.join(git_toplevel_directory, 'project'))
+end
+
+# main
+arguments     = ARGV
+
+# collect filenames
+files         = ARGV.select{| argument | argument !~ /^-/ }.join(' ')
+release_type  = []
+@version_bump = nil
+
+OptionParser.new do | opts |
+  opts.banner     = "Project versioning, changelog creation and release automation tool"
+  opts.define_head "Usage: #{ File.basename($0) } <files> [options]"
+  opts.on('--major', "Performs a major release; bumps up major version number") do
+    release_type << :major
+  end
+  opts.on('--minor', "Performs a minor release; bumps up minor version number") do
+    release_type << :minor
+  end
+  opts.on('--patch', "Performs a patch release; bumps up patch number (default)") do
+    release_type << :patch
+  end  
+  opts.on('-h', '--help', "Prints the synopsis and a list of the most commonly used commands") { puts opts; exit }
+  opts.parse!
+  if files.size == 0 && release_type.empty?
+    puts opts
+    exit
+  end
+end
+
+# only bump version if no files given but release_type is set
+if (files.empty? && !release_type.empty?)
+  project_name  = read_project_name
+  old_version   = version_number
+  new_version   = bump_version(old_version, release_type.first)
+  files         = [File.join(git_toplevel_directory, 'version')]
+  bump_version  = false
+end
+
+# git commit; write a commit message
+if exec("git commit #{files}") 
+
+  case release_type.size
+  when 0
+    release_type = :patch
+  when 1
+    release_type = release_type.first
+  else
+    abort "Error: Multiple release types added #{release_type.map(&:inspect).join(', ')}"
+  end
+
+  project_name  = read_project_name
+
+  if bump_version
+    old_version   = version_number
+    new_version   = bump_version(old_version, release_type)
+  end
+
+  puts "Updating #{project_name} version from #{old_version} to #{new_version}"
+
+  # create a release note 
+  release_note = "#{Time.now.to_s}  #{git_config_value('user.name')}  <#{git_config_value('user.email')}>\n\n"
+  release_note << "    * #{project_name} version #{new_version} changes:\n\n"
+  release_note << commit_message.collect{| line | "      * #{line}" }.join("\n")
+  release_note << "\n"
+
+  # add release note to changelog
+  update_changelog(release_note)
+
+  updated_files = [
+    File.join(git_toplevel_directory, 'version'),
+    File.join(git_toplevel_directory, 'changelog')
+  ]
+
+  # add changelog entry to commit; use same commit message
+  unless exec("git commit #{files} #{updated_files.join(' ')} --amend -C #{git_rev_parse('HEAD')}")
+    abort "Failed to perform commit"
+  end
+
+end

data/changelog

@@ -0,0 +1,13 @@
+Sun Oct 27 12:42:47 +0200 2013  Jussi Koljonen  <jussi.koljonen@gmail.com>
+
+    * Toki version 0.0.2 changes:
+
+      * Added support to MagLev, IronRuby and Kiji
+      * Added license to README.md
+
+Sat Oct 26 02:02:56 2013 +0300  Jussi Koljonen  <jussi.koljonen@gmail.com>
+
+    * Toki version 0.0.1 changes:
+
+      * Initial release
+      * Supports MRI, JRuby, MacRuby, RBX

data/lib/toki.rb

@@ -15,6 +15,12 @@ module Toki
         when_macruby_version(value)
       when :rbx_version
         when_rbx_version(value)
+      when :maglev_version
+        when_maglev_version(value)
+      when :ironruby_version
+        when_ironruby_version(value)
+      when :kiji_version
+        when_kiji_version(value)
       when :engine
         when_ruby_engine(value)
       when :patchlevel
@@ -69,6 +75,48 @@ module Toki
     end
   end
 
+  # MAGLEV_VERSION
+  def when_maglev_version(pattern, &block)
+    if defined?(MAGLEV_VERSION)
+      if pattern_matches_with?(MAGLEV_VERSION, pattern)
+        apply_behaviour(&block)
+      else
+        false
+      end
+    else
+      # MAGLEV_VERSION not defined
+      false
+    end
+  end
+
+  # IRONRUBY_VERSION
+  def when_ironruby_version(pattern, &block)
+    if defined?(IRONRUBY_VERSION)
+      if pattern_matches_with?(IRONRUBY_VERSION, pattern)
+        apply_behaviour(&block)
+      else
+        false
+      end
+    else
+      # IRONRUBY_VERSION not defined
+      false
+    end
+  end
+
+  # KIJI_VERSION
+  def when_kiji_version(pattern, &block)
+    if defined?(KIJI_VERSION)
+      if pattern_matches_with?(KIJI_VERSION, pattern)
+        apply_behaviour(&block)
+      else
+        false
+      end
+    else
+      # KIJI_VERSION not defined
+      false
+    end
+  end
+
   # RUBY_VERSION
   def when_ruby_version(pattern, &block)
     if pattern_matches_with?(RUBY_VERSION, pattern)

data/lib/toki/version.rb

@@ -1,3 +1,3 @@
 module Toki
-  VERSION = "0.0.1"
+  VERSION = File.read(File.expand_path('../../../version', __FILE__))
 end

data/project

@@ -0,0 +1 @@
+Toki

data/test/test_toki.rb

@@ -92,6 +92,69 @@ class TestToki < Test::Unit::TestCase
     Object.send(:remove_const, :MACRUBY_VERSION) unless macruby_version_defined
   end
 
+  def test_maglev_version
+    unless (maglev_version_defined = defined?(MAGLEV_VERSION))
+      Object.const_set(:MAGLEV_VERSION, '1.1RC1')
+    end
+    klass = Class.new do
+      extend Toki
+      def hello
+        nil
+      end
+      when_ruby :maglev_version => '1.1RC1' do
+        def hello
+          "world"
+        end
+      end
+    end
+    instance = klass.new
+    assert_equal "world", instance.hello
+  ensure
+    Object.send(:remove_const, :MAGLEV_VERSION) unless maglev_version_defined
+  end
+
+  def test_ironruby_version
+    unless (ironruby_version_defined = defined?(IRONRUBY_VERSION))
+      Object.const_set(:IRONRUBY_VERSION, '1.1.3')
+    end
+    klass = Class.new do
+      extend Toki
+      def hello
+        nil
+      end
+      when_ruby :ironruby_version => '1.1.3' do
+        def hello
+          "world"
+        end
+      end
+    end
+    instance = klass.new
+    assert_equal "world", instance.hello
+  ensure
+    Object.send(:remove_const, :IRONRUBY_VERSION) unless ironruby_version_defined
+  end
+
+  def test_kiji_version
+    unless (kiji_version_defined = defined?(KIJI_VERSION))
+      Object.const_set(:KIJI_VERSION, '0.11')
+    end
+    klass = Class.new do
+      extend Toki
+      def hello
+        nil
+      end
+      when_ruby :kiji_version => '0.11' do
+        def hello
+          "world"
+        end
+      end
+    end
+    instance = klass.new
+    assert_equal "world", instance.hello
+  ensure
+    Object.send(:remove_const, :KIJI_VERSION) unless kiji_version_defined
+  end
+
   def test_ruby_patchlevel
     klass = Class.new do
       extend Toki

data/toki.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Toki is a DSL that helps you to implement Ruby version, patchlevel, engine and platform specific code}
   gem.summary       = %q{Toki is a DSL that helps you to implement Ruby version, patchlevel, engine and platform specific code}
   gem.homepage      = "https://github.com/juskoljo/toki"
-
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = [] # gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "toki"
   gem.require_paths = ["lib"]
   gem.version       = Toki::VERSION
+  gem.license       = 'MIT'
 end

data/version

@@ -0,0 +1 @@
+0.0.2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toki
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jussi Koljonen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-26 00:00:00 Z
+date: 2013-10-27 00:00:00 Z
 dependencies: []
 
 description: Toki is a DSL that helps you to implement Ruby version, patchlevel, engine and platform specific code
@@ -33,13 +33,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/git-release
+- changelog
 - lib/toki.rb
 - lib/toki/version.rb
+- project
 - test/test_toki.rb
 - toki.gemspec
+- version
 homepage: https://github.com/juskoljo/toki
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []