zemax 0.2.0 → 2.3.4.bui2

data/HISTORY

@@ -1,4 +1,4 @@
-== 1.0.0 / 2010-04-10
+== 1.0.0 / 2010-04-12
 
 * 1 major enhancement
   * Birthday!

data/Rakefile

@@ -1,5 +1,15 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "zemax"
+require 'pathname'
+NAME = 'zemax'
+p BASE_DIR = Pathname.new(__FILE__).dirname
+p LIB_DIR =  BASE_DIR + 'lib'
+p PKG_DIR =  BASE_DIR + 'pkg'
+p DOC_DIR =  BASE_DIR + 'rdoc'
+
+$LOAD_PATH.unshift LIB_DIR
+require NAME
+
+CLASS_NAME = Zemax
+VERSION = CLASS_NAME::VERSION
 
 begin
   require 'rake'
@@ -12,5 +22,3 @@ end
 # Load rakefile tasks
 Dir['tasks/*.rake'].sort.each { |file| load file }
 
-#task :default => 'test:run'
-#task 'gem:release' => 'test:run'

data/VERSION

@@ -1 +1 @@
-0.2.0
+2.3.4.bui2

data/bin/zemax

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
-require Pathname.new(__FILE__).dirname + '/../lib/zemax'
+require Pathname.new(__FILE__).dirname + '../lib/zemax'
 
 # Put your code here
 

data/lib/zemax.rb

@@ -4,26 +4,18 @@ module Zemax
   VERSION_FILE = Pathname.new(__FILE__).dirname + '../VERSION'   # :nodoc:
   VERSION = VERSION_FILE.exist? ? VERSION_FILE.read.strip : nil
 
-  # Require ruby source file(s). Lib should be either file name or glob
+  # Requires ruby source file(s). Accepts either single filename/glob or Array of filenames/globs.
   # Accepts following options:
-  # :file:: Libs are required relative to this file - defaults to __FILE__
-  # :dir:: Required libs are located under this dir name - defaults to gem name
-  #
-  def self.require_lib( lib, opts={} )
-    file = Pathname.new(opts[:file] || __FILE__)
-    name = file.dirname + (opts[:dir] || file.basename('.*')) + lib.gsub(/(?<!.rb)$/, '.rb')
-    Pathname.glob(name.to_s).sort.each {|rb| require rb}
-  end
-
-  # Requires ruby source file(s). Accepts either single name or Array of filenames/globs
-  # Accepts following options:
-  # :file:: Libs are required relative to this file - defaults to __FILE__
-  # :dir:: Required libs are located under this dir name - defaults to gem name
+  # :*file*:: Lib(s) required relative to this file - defaults to __FILE__
+  # :*dir*:: Required lib(s) located under this dir name - defaults to gem name
   #
   def self.require_libs( libs, opts={} )
-    [libs].flatten.each {|lib| require_lib lib, opts }
+    file = Pathname.new(opts[:file] || __FILE__)
+    [libs].flatten.each do |lib|
+      name = file.dirname + (opts[:dir] || file.basename('.*')) + lib.gsub(/(?<!.rb)$/, '.rb')
+      Pathname.glob(name.to_s).sort.each {|rb| require rb}
+    end
   end
-
 end  # module Zemax
 
 # Require all ruby source files located under directory lib/zemax

data/tasks/common.rake

@@ -1,3 +1,6 @@
+#task :default => 'test:run'
+#task 'gem:release' => 'test:run'
+
 #task :build do
 #  system "gem build zemax.gemspec"
 #end

data/tasks/doc.rake

@@ -0,0 +1,12 @@
+desc 'Alias to doc:rdoc'
+task :doc => 'doc:rdoc'
+
+namespace :doc do
+  require 'rake/rdoctask'
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = DOC_DIR.basename.to_s
+    rdoc.title = "#{NAME} #{VERSION} Documentation"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+end

data/tasks/gem.rake

@@ -1,11 +1,36 @@
-task :build do
-  system "gem build zemax.gemspec"
-end
+desc 'Alias to gem:release'
+task :release => 'gem:release'
 
-task :install => :build do
-  system "gem install zemax-#{Zemax::VERSION}"
-end
+desc 'Alias to gem:build'
+task :gem => 'gem:build'
 
-task :release => :build do
-  system "gem push zemax-#{Zemax::VERSION}.gem"
+namespace :gem do
+  gem_file = "#{NAME}-#{VERSION}.gem"
+
+  desc '(Re-)Build gem'
+  task :build do
+    puts "Remove existing gem package"
+    rm_rf PKG_DIR
+    puts "Build new gem package"
+    system "gem build #{NAME}.gemspec"
+    puts "Move built gem to package dir"
+    mkdir_p PKG_DIR
+    mv gem_file, PKG_DIR
+  end
+
+  desc 'Cleanup already installed gem(s)'
+  task :cleanup do
+    puts "Cleaning up installed gem(s)"
+    system "gem cleanup #{NAME}"
+  end
+
+  desc 'Build and install gem'
+  task :install => :build do
+    system "gem install #{PKG_DIR}/#{gem_file}"
+  end
+
+  desc 'Build and push gem to Gemcutter'
+  task :release => :build do
+    system "gem push #{PKG_DIR}/#{gem_file}"
+  end
 end

data/tasks/version.rake

@@ -0,0 +1,67 @@
+class Version
+  attr_accessor :major, :minor, :patch, :build
+
+  def initialize(version_string)
+    raise "Invalid version #{version_string}" unless version_string =~ /^(\d+)\.(\d+)\.(\d+)(?:\.(.*?))?$/
+    @major = $1.to_i
+    @minor = $2.to_i
+    @patch = $3.to_i
+    @build = $4
+  end
+
+  def bump_major(x)
+    @major += x.to_i
+    @minor = 0
+    @patch = 0
+    @build = nil
+  end
+
+  def bump_minor(x)
+    @minor += x.to_i
+    @patch = 0
+    @build = nil
+  end
+
+  def bump_patch(x)
+    @patch += x.to_i
+    @build = nil
+  end
+
+  def update(major, minor, patch, build=nil)
+    @major = major
+    @minor = minor
+    @patch = patch
+    @build = build
+  end
+
+  def write
+    CLASS_NAME::VERSION_FILE.open('w') {|file| file.puts to_s }
+  end
+
+  def to_s
+    [major, minor, patch, build].compact.join('.')
+  end
+end
+
+desc 'Set version: [x.y.z] - explicitly, [1/10/100] - bump major/minor/patch, [.build] - build'
+task :version, [:command] do |t, args|
+  version = Version.new(VERSION)
+  case args.command
+    when /^(\d+)\.(\d+)\.(\d+)(?:\.(.*?))?$/  # Set version explicitly
+      version.update($1, $2, $3, $4)
+    when /^(\.(.*?))$/                        # Set build
+      version.build = $1
+    when /^(\d{1})$/                          # Bump patch
+      version.bump_patch $1
+    when /^(\d{1})0$/                         # Bump minor
+      version.bump_minor $1
+    when /^(\d{1}00)$/                        # Bump major
+      version.bump_major $1
+    else                                      # Unknown command, just display VERSION
+      puts "#{NAME} #{version}"
+      next
+  end
+
+  puts "Writing version #{version} to VERSION file"
+  version.write
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zemax
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 3
+  - 4
+  - bui2
+  version: 2.3.4.bui2
 platform: ruby
 authors: 
 - arvicco
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 +04:00
+date: 2010-04-12 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +60,9 @@ files:
 - spec/spec_helper.rb
 - spec/zemax_spec.rb
 - tasks/common.rake
+- tasks/doc.rake
 - tasks/gem.rake
+- tasks/version.rake
 - Rakefile
 - README.rdoc
 - LICENSE
@@ -83,11 +86,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: