Skip to content

Commit

Permalink
Bump yargi to 0.3.0, ruby.noe to 1.7.0 as well as dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
blambeau committed Feb 17, 2012
1 parent 634fc22 commit cd5cf9c
Show file tree
Hide file tree
Showing 12 changed files with 142 additions and 180 deletions.
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
source 'http://rubygems.org'
gemspec :name => "yargi"

group :development do
gem "rake", "~> 0.9.2"
gem "rspec", "~> 2.8.0"
gem "wlang", "~> 0.10.2"
end
40 changes: 11 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,41 +1,23 @@
PATH
remote: .
specs:
yargi (0.2.0)

GEM
remote: http://rubygems.org/
specs:
bluecloth (2.0.11)
diff-lcs (1.1.2)
highline (1.6.2)
noe (1.3.0)
highline (~> 1.6.0)
quickl (~> 0.2.0)
wlang (~> 0.10.1)
quickl (0.2.2)
rake (0.9.2)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
diff-lcs (1.1.3)
rake (0.9.2.2)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
rspec-mocks (2.8.0)
wlang (0.10.2)
yard (0.7.2)

PLATFORMS
java
ruby

DEPENDENCIES
bluecloth (~> 2.0.9)
bundler (~> 1.0)
noe (~> 1.3.0)
rake (~> 0.9.2)
rspec (~> 2.6.0)
wlang (~> 0.10.1)
yard (~> 0.7.2)
yargi!
rspec (~> 2.8.0)
wlang (~> 0.10.2)
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ task :default => :test
# See .rake files there for complete documentation.
#
Dir["tasks/*.rake"].each do |taskfile|
instance_eval File.read(taskfile), taskfile
load taskfile
end
1 change: 1 addition & 0 deletions lib/yargi/loader.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

10 changes: 5 additions & 5 deletions lib/yargi/version.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module Yargi
module Version

MAJOR = 0
MINOR = 2
MINOR = 3
TINY = 0

def self.to_s
[ MAJOR, MINOR, TINY ].join('.')
end
end

end
VERSION = Version.to_s
end
87 changes: 42 additions & 45 deletions tasks/debug_mail.rake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Installs a rake task for debuging the announcement mail.
#
# This file installs the 'rake debug_mail' that flushes an announcement mail
# for your library on the standard output. It is automatically generated
# by Noe from your .noespec file, and should therefore be configured there,
# for your library on the standard output. It is automatically generated
# by Noe from your .noespec file, and should therefore be configured there,
# under the variables/rake_tasks/debug_mail entry, as illustrated below:
#
# variables:
Expand All @@ -12,67 +12,64 @@
# nb_changelog_sections: 1
# ...
#
# If you have specific needs requiring manual intervention on this file,
# If you have specific needs requiring manual intervention on this file,
# don't forget to set safe-override to false in your noe specification:
#
#
# template-info:
# manifest:
# tasks/debug_mail.rake:
# safe-override: false
#
# The mail template used can be found in debug_mail.txt. That file may be
# changed to tune the mail you want to send. If you do so, don't forget to
# add a manifest entry in your .noespec file to avoid overriding you
# changes. The mail template uses wlang, with parentheses for block
# add a manifest entry in your .noespec file to avoid overriding you
# changes. The mail template uses wlang, with parentheses for block
# delimiters.
#
# template-info:
# manifest:
# tasks/debug_mail.txt:
# safe-override: false
#
begin
require 'wlang'
desc "Debug the release announcement mail"
task :debug_mail do
begin
require 'wlang'
rescue LoadError
abort "wlang is not available. Try 'gem install wlang'"
end
require 'yaml'

desc "Debug the release announcement mail"
task :debug_mail do
# Check that a .noespec file exists
noespec_file = File.expand_path('../../yargi.noespec', __FILE__)
unless File.exists?(noespec_file)
raise "Unable to find .noespec project file, sorry."
end

# Load it as well as variables and options
noespec = YAML::load(File.read(noespec_file))
vars = noespec['variables'] || {}

# Changes are taken from CHANGELOG
logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
unless logs.size == 1
abort "Unable to find a changelog file"
end

# Load interesting changesets
changes, end_found = [], 0
File.readlines(logs.first).select{|line|
if line =~ /^#/
break if end_found >= 1
end_found += 1
end
changes << line
}
vars['changes'] = changes.join

# WLang template
template = File.expand_path('../debug_mail.txt', __FILE__)

# Let's go!
$stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
# Check that a .noespec file exists
noespec_file = File.expand_path('../../yargi.noespec', __FILE__)
unless File.exists?(noespec_file)
raise "Unable to find .noespec project file, sorry."
end

rescue LoadError
task :debug_mail do
abort "wlang is not available. Try 'gem install wlang'"
# Load it as well as variables and options
noespec = YAML::load(File.read(noespec_file))
vars = noespec['variables'] || {}

# Changes are taken from CHANGELOG
logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
unless logs.size == 1
abort "Unable to find a changelog file"
end

# Load interesting changesets
changes, end_found = [], 0
File.readlines(logs.first).select{|line|
if line =~ /^# /
break if end_found >= 1
end_found += 1
end
changes << line
}
vars['changes'] = changes.join

# WLang template
template = File.expand_path('../debug_mail.txt', __FILE__)

# Let's go!
$stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
end
26 changes: 13 additions & 13 deletions tasks/gem.rake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Installs rake tasks for gemming and packaging
#
# This file installs the 'rake package', 'rake gem' tasks and associates
# (clobber_package, repackage, ...). It is automatically generated by Noe
# from your .noespec file, and should therefore be configured there, under
# This file installs the 'rake package', 'rake gem' tasks and associates
# (clobber_package, repackage, ...). It is automatically generated by Noe
# from your .noespec file, and should therefore be configured there, under
# the variables/rake_tasks/gem entry, as illustrated below:
#
# variables:
Expand All @@ -15,9 +15,9 @@
# need_zip: false
# ...
#
# If you have specific needs requiring manual intervention on this file,
# If you have specific needs requiring manual intervention on this file,
# don't forget to set safe-override to false in your noe specification:
#
#
# template-info:
# manifest:
# tasks/gem.rake:
Expand All @@ -32,28 +32,28 @@ begin

# Version of the package
t.version = $gemspec.version

# Directory used to store the package files
t.package_dir = "pkg"

# True if a gzipped tar file (tgz) should be produced
t.need_tar = false

# True if a gzipped tar file (tar.gz) should be produced
t.need_tar_gz = false

# True if a bzip2'd tar file (tar.bz2) should be produced
t.need_tar_bz2 = false

# True if a zip file should be produced (default is false)
t.need_zip = false

# List of files to be included in the package.
t.package_files = $gemspec.files

# Tar command for gzipped or bzip2ed archives.
t.tar_command = "tar"

# Zip command for zipped archives.
t.zip_command = "zip"

Expand Down
24 changes: 8 additions & 16 deletions tasks/spec_test.rake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Installs a rake task for for running examples written using rspec.
#
# This file installs the 'rake spec_test' (aliased as 'rake spec') as well as
# extends 'rake test' to run spec tests, if any. It is automatically generated
# by Noe from your .noespec file, and should therefore be configured there,
# extends 'rake test' to run spec tests, if any. It is automatically generated
# by Noe from your .noespec file, and should therefore be configured there,
# under the variables/rake_tasks/spec_test entry, as illustrated below:
#
# variables:
Expand All @@ -13,16 +13,16 @@
# rspec_opts: [--color, --backtrace]
# ...
#
# If you have specific needs requiring manual intervention on this file,
# If you have specific needs requiring manual intervention on this file,
# don't forget to set safe-override to false in your noe specification:
#
#
# template-info:
# manifest:
# tasks/spec_test.rake:
# safe-override: false
#
# This file has been written to conform to RSpec v2.4.0. More information about
# rspec and options of the rake task defined below can be found on
# This file has been written to conform to RSpec v2.4.0. More information about
# rspec and options of the rake task defined below can be found on
# http://relishapp.com/rspec
#
begin
Expand All @@ -32,15 +32,7 @@ begin
# Glob pattern to match files.
t.pattern = "spec/**/test_*.rb"

# By default, if there is a Gemfile, the generated command will include
# 'bundle exec'. Set this to true to ignore the presence of a Gemfile,
# and not add 'bundle exec' to the command.
t.skip_bundler = false

# Name of Gemfile to use
t.gemfile = "Gemfile"

# Whether or not to fail Rake when an error occurs (typically when
# Whether or not to fail Rake when an error occurs (typically when
# examples fail).
t.fail_on_error = true

Expand All @@ -60,7 +52,7 @@ begin
# Command line options to pass to rcov. See 'rcov --help' about this
t.rcov_opts = []

# Command line options to pass to ruby. See 'ruby --help' about this
# Command line options to pass to ruby. See 'ruby --help' about this
t.ruby_opts = []

# Path to rspec
Expand Down
Loading

0 comments on commit cd5cf9c

Please sign in to comment.