Skip to content

Commit

Permalink
removed the force flag and feature as it wont be needed
Browse files Browse the repository at this point in the history
  • Loading branch information
Mario Visic committed Aug 22, 2010
1 parent f75d781 commit 103b580
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 58 deletions.
7 changes: 1 addition & 6 deletions README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,4 @@

a script that is used to create a new radiant project with extensions attached and ready to use
to create a new project simply run:
radiant-go projectname

== overriding files

use the --force parameter to overwrite any existing files. by default files that already exist are skipped
radiant-go existing_project --force
radiant-go projectname
5 changes: 2 additions & 3 deletions bin/radiant-go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ else

config = (ARGV[0] == '-c' || ARGV[0] == '--create-config') ? true : false
usage = ARGV.any? {|arg| arg == '-h' || arg == '--help'} ? true : false
force = ARGV.any? {|arg| arg == '-f' || arg == '--force'} ? true : false
version = ARGV.any? {|arg| arg == '-v' || arg == '--version'} ? true : false

if config == true
Expand All @@ -19,7 +18,7 @@ else
else

name = ARGV[1]
installer = RadiantGo::Installers::Main.new(name, false)
installer = RadiantGo::Installers::Main.new(name)
installer.create_config

end
Expand All @@ -30,7 +29,7 @@ else
puts RadiantGo::Main.version
else
name = ARGV.shift
installer = RadiantGo::Installers::Main.new(name, force)
installer = RadiantGo::Installers::Main.new(name)
installer.run()
end

Expand Down
9 changes: 4 additions & 5 deletions lib/radiant-go/installers/main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ module Installers

class Main

def initialize(name, force = false)
def initialize(name)

@project_name = name
@force = force
Config.gemfile_location = File.expand_path(File.dirname(__FILE__)) + '/../../../config/Gemfile'

end

def run

radiant = Installers::Radiant.new(@project_name, Config.database, @force)
radiant = Installers::Radiant.new(@project_name, Config.database)
bundler = Installers::Bundler.new(@project_name)

puts '== generating radiant project'
Expand All @@ -36,8 +35,8 @@ def run

def copy_gemfile(name)

# we only copy the file if it doesn't exist or if force is on!
if !File.exists?(name + '/Gemfile') || @force == true
# we only copy the file if it doesn't exist
if !File.exists?(name + '/Gemfile')
File.new(name + '/Gemfile', File::CREAT) unless File.exists?(name + '/Gemfile')

source = File.open(Config.gemfile_location, 'r')
Expand Down
7 changes: 1 addition & 6 deletions lib/radiant-go/installers/radiant.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,13 @@ module Installers

class Radiant

def initialize(name, database, force)
def initialize(name, database)
@name = name
@database = database
@force = force
end

def create
if @force
%x[radiant #{@name} --force --database=#{@database}]
else
%x[radiant #{@name} --skip --database=#{@database}]
end
end

def bootstrap
Expand Down
2 changes: 1 addition & 1 deletion spec/radiant-go/installers/bundler_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Installers

before(:all) do
@bundler = Bundler.new('test')
@installer = Main.new('test', false)
@installer = Main.new('test')
Dir.mkdir 'test'

end
Expand Down
21 changes: 2 additions & 19 deletions spec/radiant-go/installers/main_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Installers

before(:each) do
Dir.mkdir 'test'
@main = Main.new('test', false)
@main = Main.new('test')
end

after(:each) do
Expand All @@ -29,7 +29,6 @@ module Installers
end

it 'should have a gemfile that isn\'t empty' do
@main = Main.new('test', false)
@main.copy_gemfile('test')
File.zero?('test/Gemfile').should_not be true
end
Expand All @@ -46,23 +45,7 @@ module Installers
File.exists?('test/Gemfile').should be true
File.size('test/Gemfile').should be 0
end

it 'should write over an existing gemfile' do

# turn forcing on
@main = Main.new('test', true)

# we create a new gemfile and make it blank
gemfile = File.new('test/Gemfile', File::CREAT)
gemfile.close
File.size('test/Gemfile').should be 0

# we copy the file over our gemfile, now it should have a different filesize
@main.copy_gemfile('test')
File.exists?('test/Gemfile').should be true
File.size('test/Gemfile').should be > 0
end


end

end
Expand Down
19 changes: 1 addition & 18 deletions spec/radiant-go/installers/radiant_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module Installers
describe Radiant do

before(:all) do
@installer = Radiant.new('test', Config.database, false)
@installer = Radiant.new('test', Config.database)
end

after(:all) do
Expand All @@ -33,23 +33,6 @@ module Installers

end

it 'should write over existing project files when force is on' do

# turn force on
@installer = Radiant.new('test', Config.database, true)

# make the README blank (could be any radiant file instead of README)
File.delete 'test/README'
readme = File.new('test/README', File::CREAT)
readme.close
File.size('test/README').should be 0

# it should ovveride
@installer.create
File.size('test/README').should be > 0

end

it 'should create a non empty database file upon bootstrap' do

File.exists?('test/db/development.' + Config.database + '.db').should be false
Expand Down

0 comments on commit 103b580

Please sign in to comment.