Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relax rspec dependency and some minor whitespace changes #165

Merged
merged 3 commits into from Nov 21, 2011
Merged

Relax rspec dependency and some minor whitespace changes #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7942ae8
relax the rspec dependency constraint
joshk Nov 20, 2011
913f95b
update the Gemfile to use gemspec, and relock
joshk Nov 21, 2011
baf9a08
some minor alignment and whitespace changes in the Rakefile
joshk Nov 21, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
@@ -1,5 +1,3 @@
source "http://rubygems.org" source "http://rubygems.org"


gem "veewee", :path => "." gemspec

#gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
45 changes: 23 additions & 22 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ PATH
net-ssh (~> 2.1.0) net-ssh (~> 2.1.0)
popen4 (~> 0.1.2) popen4 (~> 0.1.2)
progressbar progressbar
rspec (~> 2.5.0) rspec (~> 2.5)
thor (~> 0.14.6) thor (~> 0.14.6)
vagrant (~> 0.8.2) vagrant (~> 0.8.2)


Expand All @@ -17,52 +17,53 @@ GEM
Platform (0.4.0) Platform (0.4.0)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
builder (3.0.0) builder (3.0.0)
cucumber (1.0.2) cucumber (1.0.6)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.2)
gherkin (~> 2.4.5) gherkin (~> 2.4.18)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.5) term-ansicolor (>= 1.0.6)
diff-lcs (1.1.2) diff-lcs (1.1.3)
erubis (2.7.0) erubis (2.7.0)
ffi (1.0.9) ffi (1.0.11)
gherkin (2.4.5) gherkin (2.4.21)
json (>= 1.4.6) json (>= 1.4.6)
highline (1.6.2) highline (1.6.8)
i18n (0.5.0) i18n (0.6.0)
json (1.5.3) json (1.5.4)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.1.4) net-ssh (2.1.4)
open4 (1.1.0) open4 (1.3.0)
popen4 (0.1.2) popen4 (0.1.2)
Platform (>= 0.4.0) Platform (>= 0.4.0)
open4 (>= 0.4.0) open4 (>= 0.4.0)
progressbar (0.9.1) progressbar (0.9.1)
rspec (2.5.0) rspec (2.7.0)
rspec-core (~> 2.5.0) rspec-core (~> 2.7.0)
rspec-expectations (~> 2.5.0) rspec-expectations (~> 2.7.0)
rspec-mocks (~> 2.5.0) rspec-mocks (~> 2.7.0)
rspec-core (2.5.2) rspec-core (2.7.1)
rspec-expectations (2.5.0) rspec-expectations (2.7.0)
diff-lcs (~> 1.1.2) diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0) rspec-mocks (2.7.0)
term-ansicolor (1.0.6) term-ansicolor (1.0.7)
thor (0.14.6) thor (0.14.6)
vagrant (0.8.2) vagrant (0.8.7)
archive-tar-minitar (= 0.5.2) archive-tar-minitar (= 0.5.2)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.5.0) i18n (~> 0.6.0)
json (~> 1.5.1) json (~> 1.5.1)
net-scp (~> 1.0.4) net-scp (~> 1.0.4)
net-ssh (~> 2.1.4) net-ssh (~> 2.1.4)
thor (~> 0.14.6) thor (~> 0.14.6)
virtualbox (~> 0.9.1) virtualbox (~> 0.9.1)
virtualbox (0.9.1) virtualbox (0.9.2)
ffi (~> 1.0.9) ffi (~> 1.0.9)


PLATFORMS PLATFORMS
ruby ruby


DEPENDENCIES DEPENDENCIES
bundler (>= 1.0.0)
veewee! veewee!
77 changes: 41 additions & 36 deletions Rakefile
View file
Open in desktop
Expand Up @@ -4,67 +4,72 @@ require 'bundler/setup'
Bundler::GemHelper.install_tasks Bundler::GemHelper.install_tasks


#Setup some base variables to use #Setup some base variables to use
veewee_dir= "." veewee_dir = "."
definition_dir= File.expand_path(File.join(veewee_dir, "definitions")) lib_dir = File.expand_path(File.join(veewee_dir, "lib"))
lib_dir= File.expand_path(File.join(veewee_dir, "lib")) box_dir = File.expand_path(File.join(veewee_dir, "boxes"))
box_dir= File.expand_path(File.join(veewee_dir, "boxes")) vbox_dir = File.expand_path(File.join(veewee_dir, "tmp"))
template_dir=File.expand_path(File.join(veewee_dir, "templates")) tmp_dir = File.expand_path(File.join(veewee_dir, "tmp"))
vbox_dir=File.expand_path(File.join(veewee_dir, "tmp")) iso_dir = File.expand_path(File.join(veewee_dir, "iso"))
tmp_dir=File.expand_path(File.join(veewee_dir, "tmp")) definition_dir = File.expand_path(File.join(veewee_dir, "definitions"))
iso_dir=File.expand_path(File.join(veewee_dir, "iso")) template_dir = File.expand_path(File.join(veewee_dir, "templates"))




#Load Veewee::Session libraries #Load Veewee::Session libraries
Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f| Dir.glob(File.join(lib_dir, '**','*.rb')).each { |f| require f }
require f }


#Initialize #Initialize
Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition_dir, Veewee::Session.setenv({
:template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir}) :veewee_dir => veewee_dir,
:definition_dir => definition_dir,
:template_dir => template_dir,
:iso_dir => iso_dir,
:box_dir => box_dir,
:tmp_dir => tmp_dir
})


desc 'Default: list templates' desc 'Default: list templates'
task :default => [:templates] task :default => [:templates]


desc 'List templates' desc 'List templates'
task :templates do task :templates do
Veewee::Session.list_templates Veewee::Session.list_templates
end end


desc 'Define box' desc 'Define box'
task :define, [:boxname,:template_name] do |t,args| task :define, [:boxname,:template_name] do |t,args|
if args.to_hash.size!=2 if args.to_hash.size!=2
puts "needs two arguments: rake define['boxname','template_name']" puts "needs two arguments: rake define['boxname','template_name']"
exit exit
end end
Veewee::Session.define(args.boxname,args.template_name) Veewee::Session.define(args.boxname,args.template_name)
end end


desc 'Undefine box' desc 'Undefine box'
task :undefine, [:boxname] do |t,args| task :undefine, [:boxname] do |t,args|
if args.to_hash.size!=1 if args.to_hash.size!=1
puts "needs one arguments: rake undefine[\"yourname\"]" puts "needs one arguments: rake undefine[\"yourname\"]"
exit exit
end end
Veewee::Session.undefine(args.boxname) Veewee::Session.undefine(args.boxname)
end end


desc 'List Definitions' desc 'List Definitions'
task :definitions do task :definitions do
Veewee::Session.list_definitions Veewee::Session.list_definitions
end end


desc 'Build box' desc 'Build box'
task :build, [:boxname] do |t,args| task :build, [:boxname] do |t,args|
if args.to_hash.size!=1 if args.to_hash.size!=1
puts "needs one arguments: rake build['boxname']" puts "needs one arguments: rake build['boxname']"
exit exit
end end
Veewee::Session.build(args.boxname) Veewee::Session.build(args.boxname)
end end


desc 'List boxes' desc 'List boxes'
task :boxes do task :boxes do
Veewee::Session.list_boxes Veewee::Session.list_boxes
end end


desc 'Export box' desc 'Export box'
Expand All @@ -73,20 +78,20 @@ task :export, [:boxname] do |t,args|
puts "needs one arguments: rake export['boxname']" puts "needs one arguments: rake export['boxname']"
exit exit
end end
Veewee::Session.export_box(args.boxname) Veewee::Session.export_box(args.boxname)
end end


desc 'Remove box' desc 'Remove box'
task :remove_box, [:boxname] do |t,args| task :remove_box, [:boxname] do |t,args|
Veewee::Session.remove_box(args.boxname) Veewee::Session.remove_box(args.boxname)
end end


desc 'List ostypes available' desc 'List ostypes available'
task :list_ostypes do |t,args| task :list_ostypes do |t,args|
Veewee::Session.list_ostypes Veewee::Session.list_ostypes
end end


desc 'Clean all unfinished builds' desc 'Clean all unfinished builds'
task :clean do task :clean do
Veewee::Session.clean Veewee::Session.clean
end end
12 changes: 6 additions & 6 deletions veewee.gemspec
View file
Open in desktop
Expand Up @@ -14,20 +14,20 @@ Gem::Specification.new do |s|
s.required_rubygems_version = ">= 1.3.6" s.required_rubygems_version = ">= 1.3.6"
s.rubyforge_project = "veewee" s.rubyforge_project = "veewee"


s.add_dependency "vagrant", "~> 0.8.2" s.add_dependency "vagrant", "~> 0.8.2"
s.add_dependency "net-ssh", "~> 2.1.0" s.add_dependency "net-ssh", "~> 2.1.0"
s.add_dependency "popen4", "~> 0.1.2" s.add_dependency "popen4", "~> 0.1.2"
s.add_dependency "thor", "~> 0.14.6" s.add_dependency "thor", "~> 0.14.6"
s.add_dependency "highline", "~> 1.6.1" s.add_dependency "highline", "~> 1.6.1"
s.add_dependency "progressbar" s.add_dependency "progressbar"
s.add_dependency "cucumber", "~> 1.0.2" s.add_dependency "cucumber", "~> 1.0.2"
s.add_dependency "rspec", "~> 2.5.0" s.add_dependency "rspec", "~> 2.5"
#s.add_dependency "simon", "~> 0.1.1" #s.add_dependency "simon", "~> 0.1.1"


s.add_development_dependency "bundler", ">= 1.0.0" s.add_development_dependency "bundler", ">= 1.0.0"


s.files = `git ls-files`.split("\n") s.files = `git ls-files`.split("\n")
s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact s.executables = `git ls-files`.split("\n").map{ |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
s.require_path = 'lib' s.require_path = 'lib'
end end