From 6a31b32690c1454fbcea3d4fc2cdced385ba2c3e Mon Sep 17 00:00:00 2001 From: Dr Nic Williams Date: Thu, 3 Jul 2008 11:19:34 +1000 Subject: [PATCH] Renamed project from 'iphoneruby' to 'rbiphonetest' --- History.txt | 8 ++++- Manifest.txt | 29 ++++++++++--------- PostInstall.txt | 2 +- README.rdoc | 12 ++++---- .../{iphoneruby => rbiphonetest}/USAGE | 0 .../rbiphonetest_generator.rb} | 4 +-- .../templates/Rakefile | 0 .../templates/dot_autotest | 0 .../templates/test/test_helper.rb | 0 bin/iphoneruby | 19 ++++-------- bin/rbiphonetest | 17 +++++++++++ config/hoe.rb | 12 ++++---- lib/{iphoneruby.rb => rbiphonetest.rb} | 2 +- lib/{iphoneruby => rbiphonetest}/version.rb | 4 +-- .../model/USAGE | 0 .../model/model_generator.rb | 0 .../model/templates/model.h | 0 .../model/templates/model.m | 2 +- .../model/templates/test.rb | 0 script/console | 4 +-- script/txt2html | 6 ++-- test/test_helper.rb | 2 +- test/test_model_generator.rb | 2 +- ...est_iphoneruby.rb => test_rbiphonetest.rb} | 2 +- ...ator.rb => test_rbiphonetest_generator.rb} | 2 +- 25 files changed, 73 insertions(+), 56 deletions(-) rename app_generators/{iphoneruby => rbiphonetest}/USAGE (100%) rename app_generators/{iphoneruby/iphoneruby_generator.rb => rbiphonetest/rbiphonetest_generator.rb} (96%) rename app_generators/{iphoneruby => rbiphonetest}/templates/Rakefile (100%) rename app_generators/{iphoneruby => rbiphonetest}/templates/dot_autotest (100%) rename app_generators/{iphoneruby => rbiphonetest}/templates/test/test_helper.rb (100%) create mode 100644 bin/rbiphonetest rename lib/{iphoneruby.rb => rbiphonetest.rb} (85%) rename lib/{iphoneruby => rbiphonetest}/version.rb (76%) rename {iphoneruby_generators => rbiphonetest_generators}/model/USAGE (100%) rename {iphoneruby_generators => rbiphonetest_generators}/model/model_generator.rb (100%) rename {iphoneruby_generators => rbiphonetest_generators}/model/templates/model.h (100%) rename {iphoneruby_generators => rbiphonetest_generators}/model/templates/model.m (82%) rename {iphoneruby_generators => rbiphonetest_generators}/model/templates/test.rb (100%) rename test/{test_iphoneruby.rb => test_rbiphonetest.rb} (67%) rename test/{test_iphoneruby_generator.rb => test_rbiphonetest_generator.rb} (96%) diff --git a/History.txt b/History.txt index aba694e..bbe5584 100644 --- a/History.txt +++ b/History.txt @@ -1,5 +1,11 @@ +== 0.2.0 2008-07-03 + +* Renamed project from 'iphoneruby' to 'rbiphonetest' +* iphoneruby app: prints a deprecation message +* USE: "rbiphonetest ." to install test framework now + == 0.1.0 2008-06-28 * Initial release - * iphoneruby cmd - adds test framework to your Xcode project + * rbiphonetest cmd - adds test framework to your Xcode project * script/generate model FooBar - creates Classes/FooBar.h+m and test/test_foo_bar.rb diff --git a/Manifest.txt b/Manifest.txt index ea5701c..09a848e 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -4,21 +4,22 @@ Manifest.txt PostInstall.txt README.rdoc Rakefile -app_generators/iphoneruby/USAGE -app_generators/iphoneruby/iphoneruby_generator.rb -app_generators/iphoneruby/templates/Rakefile -app_generators/iphoneruby/templates/dot_autotest -app_generators/iphoneruby/templates/test/test_helper.rb +app_generators/rbiphonetest/USAGE +app_generators/rbiphonetest/rbiphonetest_generator.rb +app_generators/rbiphonetest/templates/Rakefile +app_generators/rbiphonetest/templates/dot_autotest +app_generators/rbiphonetest/templates/test/test_helper.rb bin/iphoneruby +bin/rbiphonetest config/hoe.rb config/requirements.rb -iphoneruby_generators/model/USAGE -iphoneruby_generators/model/model_generator.rb -iphoneruby_generators/model/templates/model.h -iphoneruby_generators/model/templates/model.m -iphoneruby_generators/model/templates/test.rb -lib/iphoneruby.rb -lib/iphoneruby/version.rb +lib/rbiphonetest.rb +lib/rbiphonetest/version.rb +rbiphonetest_generators/model/USAGE +rbiphonetest_generators/model/model_generator.rb +rbiphonetest_generators/model/templates/model.h +rbiphonetest_generators/model/templates/model.m +rbiphonetest_generators/model/templates/test.rb script/console script/destroy script/generate @@ -29,6 +30,6 @@ tasks/environment.rake tasks/website.rake test/test_generator_helper.rb test/test_helper.rb -test/test_iphoneruby.rb -test/test_iphoneruby_generator.rb test/test_model_generator.rb +test/test_rbiphonetest.rb +test/test_rbiphonetest_generator.rb diff --git a/PostInstall.txt b/PostInstall.txt index 38328ee..cf31dd9 100644 --- a/PostInstall.txt +++ b/PostInstall.txt @@ -2,7 +2,7 @@ You can add Ruby-based unit tests to any iPhone/Xcode project by changing to the project's folder in the terminal/console and running: - iphoneruby . + rbiphonetest . This adds the test framework, a Rakefile, and an `autotest` config file. diff --git a/README.rdoc b/README.rdoc index bb88fb4..d1e6e65 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,6 +1,6 @@ -= iphoneruby += rbiphonetest -* http://iphoneruby.rubyforge.org +* http://rbiphonetest.rubyforge.org == DESCRIPTION: @@ -22,7 +22,7 @@ Known issues: * Create a new iPhone project using Xcode templates * Open the terminal * Change to project folder -* `iphoneruby .` +* `rbiphonetest .` This adds the test framework, a Rakefile, and an `autotest` config file. @@ -49,12 +49,12 @@ If using autotest, your tests will be re-run if the test files or the Objective- == INSTALL: - sudo gem install iphoneruby (COMING SOON) + sudo gem install rbiphonetest (COMING SOON) From source: - git clone git://github.com/drnic/iphoneruby.git - cd iphoneruby + git clone git://github.com/drnic/rbiphonetest.git + cd rbiphonetest rake install_gem == LICENSE: diff --git a/app_generators/iphoneruby/USAGE b/app_generators/rbiphonetest/USAGE similarity index 100% rename from app_generators/iphoneruby/USAGE rename to app_generators/rbiphonetest/USAGE diff --git a/app_generators/iphoneruby/iphoneruby_generator.rb b/app_generators/rbiphonetest/rbiphonetest_generator.rb similarity index 96% rename from app_generators/iphoneruby/iphoneruby_generator.rb rename to app_generators/rbiphonetest/rbiphonetest_generator.rb index 6348812..6bfe61b 100644 --- a/app_generators/iphoneruby/iphoneruby_generator.rb +++ b/app_generators/rbiphonetest/rbiphonetest_generator.rb @@ -1,4 +1,4 @@ -class IphonerubyGenerator < RubiGen::Base +class RbiphonetestGenerator < RubiGen::Base DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) @@ -26,7 +26,7 @@ def manifest m.file "dot_autotest", ".autotest" m.file_copy_each ["test/test_helper.rb"] - m.dependency "install_rubigen_scripts", [destination_root, 'iphoneruby'], + m.dependency "install_rubigen_scripts", [destination_root, 'rbiphonetest'], :shebang => options[:shebang], :collision => :force end end diff --git a/app_generators/iphoneruby/templates/Rakefile b/app_generators/rbiphonetest/templates/Rakefile similarity index 100% rename from app_generators/iphoneruby/templates/Rakefile rename to app_generators/rbiphonetest/templates/Rakefile diff --git a/app_generators/iphoneruby/templates/dot_autotest b/app_generators/rbiphonetest/templates/dot_autotest similarity index 100% rename from app_generators/iphoneruby/templates/dot_autotest rename to app_generators/rbiphonetest/templates/dot_autotest diff --git a/app_generators/iphoneruby/templates/test/test_helper.rb b/app_generators/rbiphonetest/templates/test/test_helper.rb similarity index 100% rename from app_generators/iphoneruby/templates/test/test_helper.rb rename to app_generators/rbiphonetest/templates/test/test_helper.rb diff --git a/bin/iphoneruby b/bin/iphoneruby index ac950b7..78e1364 100644 --- a/bin/iphoneruby +++ b/bin/iphoneruby @@ -1,17 +1,10 @@ #!/usr/bin/env ruby -require 'rubygems' -require 'rubigen' +puts <<-EOS +DEPRECATION: this project has been renamed to 'rbiphonetest' -if %w(-v --version).include? ARGV.first - require 'iphoneruby/version' - puts "#{File.basename($0)} #{Iphoneruby::VERSION::STRING}" - exit(0) -end +Please use the new executable: -require 'rubigen/scripts/generate' -source = RubiGen::PathSource.new(:application, - File.join(File.dirname(__FILE__), "../app_generators")) -RubiGen::Base.reset_sources -RubiGen::Base.append_sources source -RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'iphoneruby') + rbiphonetest . + +EOS \ No newline at end of file diff --git a/bin/rbiphonetest b/bin/rbiphonetest new file mode 100644 index 0000000..acfc564 --- /dev/null +++ b/bin/rbiphonetest @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'rubigen' + +if %w(-v --version).include? ARGV.first + require 'rbiphonetest/version' + puts "#{File.basename($0)} #{Iphoneruby::VERSION::STRING}" + exit(0) +end + +require 'rubigen/scripts/generate' +source = RubiGen::PathSource.new(:application, + File.join(File.dirname(__FILE__), "../app_generators")) +RubiGen::Base.reset_sources +RubiGen::Base.append_sources source +RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'rbiphonetest') diff --git a/config/hoe.rb b/config/hoe.rb index 807b948..4105918 100644 --- a/config/hoe.rb +++ b/config/hoe.rb @@ -1,11 +1,11 @@ -require 'iphoneruby/version' +require 'rbiphonetest/version' AUTHOR = 'Dr Nic Williams' EMAIL = "drnicwilliams@gmail.com" DESCRIPTION = "Want to write iPhone unit tests? Want to write them in Ruby?" -GEM_NAME = 'iphoneruby' # what ppl will type to install your gem -RUBYFORGE_PROJECT = 'iphoneruby' # The unix name for your project -HOMEPATH = "http://github.com/drnic/iphoneruby" +GEM_NAME = 'rbiphonetest' # what ppl will type to install your gem +RUBYFORGE_PROJECT = 'rbiphonetest' # The unix name for your project +HOMEPATH = "http://github.com/drnic/rbiphonetest" DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}" EXTRA_DEPENDENCIES = [ ['rubigen', '>= 1.3.2'] @@ -31,8 +31,8 @@ def rubyforge_username end -VERS = IPhoneRuby::VERSION::STRING -RDOC_OPTS = ['--quiet', '--title', 'iphoneruby documentation', +VERS = RbIphoneTest::VERSION::STRING +RDOC_OPTS = ['--quiet', '--title', 'rbiphonetest documentation', "--opname", "index.html", "--line-numbers", "--main", "README", diff --git a/lib/iphoneruby.rb b/lib/rbiphonetest.rb similarity index 85% rename from lib/iphoneruby.rb rename to lib/rbiphonetest.rb index ad8634c..1e40a44 100644 --- a/lib/iphoneruby.rb +++ b/lib/rbiphonetest.rb @@ -1,6 +1,6 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) -module IPhoneRuby +module RbIphoneTest end \ No newline at end of file diff --git a/lib/iphoneruby/version.rb b/lib/rbiphonetest/version.rb similarity index 76% rename from lib/iphoneruby/version.rb rename to lib/rbiphonetest/version.rb index 349fa5d..0a5c271 100644 --- a/lib/iphoneruby/version.rb +++ b/lib/rbiphonetest/version.rb @@ -1,7 +1,7 @@ -module IPhoneRuby +module RbIphoneTest module VERSION #:nodoc: MAJOR = 0 - MINOR = 1 + MINOR = 2 TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') diff --git a/iphoneruby_generators/model/USAGE b/rbiphonetest_generators/model/USAGE similarity index 100% rename from iphoneruby_generators/model/USAGE rename to rbiphonetest_generators/model/USAGE diff --git a/iphoneruby_generators/model/model_generator.rb b/rbiphonetest_generators/model/model_generator.rb similarity index 100% rename from iphoneruby_generators/model/model_generator.rb rename to rbiphonetest_generators/model/model_generator.rb diff --git a/iphoneruby_generators/model/templates/model.h b/rbiphonetest_generators/model/templates/model.h similarity index 100% rename from iphoneruby_generators/model/templates/model.h rename to rbiphonetest_generators/model/templates/model.h diff --git a/iphoneruby_generators/model/templates/model.m b/rbiphonetest_generators/model/templates/model.m similarity index 82% rename from iphoneruby_generators/model/templates/model.m rename to rbiphonetest_generators/model/templates/model.m index d8cab19..f4294ac 100644 --- a/iphoneruby_generators/model/templates/model.m +++ b/rbiphonetest_generators/model/templates/model.m @@ -16,7 +16,7 @@ @implementation <%= class_name %> // This initialization function gets called when we import the Ruby module. // It doesn't need to do anything because the RubyCocoa bridge will do // all the initialization work. -// The iphoneruby test framework automatically generates bundles for +// The rbiphonetest test framework automatically generates bundles for // each objective-c class containing the following line. These // can be used by your tests. void Init_<%= class_name %>() { } \ No newline at end of file diff --git a/iphoneruby_generators/model/templates/test.rb b/rbiphonetest_generators/model/templates/test.rb similarity index 100% rename from iphoneruby_generators/model/templates/test.rb rename to rbiphonetest_generators/model/templates/test.rb diff --git a/script/console b/script/console index 9025752..c8a51e7 100755 --- a/script/console +++ b/script/console @@ -5,6 +5,6 @@ irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb' libs = " -r irb/completion" # Perhaps use a console_lib to store any extra methods I may want available in the cosole # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}" -libs << " -r #{File.dirname(__FILE__) + '/../lib/iphoneruby.rb'}" -puts "Loading iphoneruby gem" +libs << " -r #{File.dirname(__FILE__) + '/../lib/rbiphonetest.rb'}" +puts "Loading rbiphonetest gem" exec "#{irb} #{libs} --simple-prompt" \ No newline at end of file diff --git a/script/txt2html b/script/txt2html index 19018b6..f99f1c7 100755 --- a/script/txt2html +++ b/script/txt2html @@ -1,7 +1,7 @@ #!/usr/bin/env ruby -GEM_NAME = 'iphoneruby' # what ppl will type to install your gem -RUBYFORGE_PROJECT = 'iphoneruby' +GEM_NAME = 'rbiphonetest' # what ppl will type to install your gem +RUBYFORGE_PROJECT = 'rbiphonetest' require 'rubygems' begin @@ -17,7 +17,7 @@ require 'syntax/convertors/html' require 'erb' require File.dirname(__FILE__) + "/../lib/#{GEM_NAME}/version.rb" -version = IPhoneRuby::VERSION::STRING +version = RbIphoneTest::VERSION::STRING download = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}" def rubyforge_project_id diff --git a/test/test_helper.rb b/test/test_helper.rb index 85c0831..7615724 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,2 +1,2 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../lib/iphoneruby' +require File.dirname(__FILE__) + '/../lib/rbiphonetest' diff --git a/test/test_model_generator.rb b/test/test_model_generator.rb index fafecc2..dfb1df5 100644 --- a/test/test_model_generator.rb +++ b/test/test_model_generator.rb @@ -43,6 +43,6 @@ def sources end def generator_path - "iphoneruby_generators" + "rbiphonetest_generators" end end diff --git a/test/test_iphoneruby.rb b/test/test_rbiphonetest.rb similarity index 67% rename from test/test_iphoneruby.rb rename to test/test_rbiphonetest.rb index 529505d..973daba 100644 --- a/test/test_iphoneruby.rb +++ b/test/test_rbiphonetest.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/test_helper.rb' -class TestIPhoneRuby < Test::Unit::TestCase +class TestRbIphoneTest < Test::Unit::TestCase def setup end diff --git a/test/test_iphoneruby_generator.rb b/test/test_rbiphonetest_generator.rb similarity index 96% rename from test/test_iphoneruby_generator.rb rename to test/test_rbiphonetest_generator.rb index a6393ab..7c31235 100644 --- a/test/test_iphoneruby_generator.rb +++ b/test/test_rbiphonetest_generator.rb @@ -26,7 +26,7 @@ def teardown # bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test def test_generator_without_options - run_generator('iphoneruby', [APP_ROOT], sources) + run_generator('rbiphonetest', [APP_ROOT], sources) assert_directory_exists "Classes" assert_directory_exists "test" assert_generated_file ".autotest"