rbiphonetest 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.4.0 2009-03-17
+
+* 2+ models now fixed! No more dependency issues between classes being tested: only one bundle created - all ObjC code being tested is compiled into one bundle
+* Upgrade internals to use latest newgem (removed bunch of dev-only files)
+* Behaviour of rbiphonetest covered by Cucumber scenarios
+
 == 0.3.0 2008-07-05
 
 * Support for test/unit AND rspec test frameworks (via install_test_unit and install_rspec generators)

data/Manifest.txt

@@ -1,17 +1,24 @@
 History.txt
-License.txt
 Manifest.txt
 PostInstall.txt
 README.rdoc
 Rakefile
 app_generators/rbiphonetest/USAGE
 app_generators/rbiphonetest/rbiphonetest_generator.rb
+app_generators/rbiphonetest/templates/Classes/module.h.erb
+app_generators/rbiphonetest/templates/Classes/module.m.erb
 app_generators/rbiphonetest/templates/Rakefile
 app_generators/rbiphonetest/templates/dot_autotest
 bin/iphoneruby
 bin/rbiphonetest
-config/hoe.rb
-config/requirements.rb
+features/development.feature
+features/models.feature
+features/new_project.feature
+features/step_definitions/cli_steps.rb
+features/step_definitions/common_steps.rb
+features/support/cli.rb
+features/support/common.rb
+features/support/env.rb
 lib/rbiphonetest.rb
 lib/rbiphonetest/version.rb
 rbiphonetest_generators/install_rspec/USAGE
@@ -41,14 +48,10 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
 test/test_generator_helper.rb
 test/test_helper.rb
 test/test_install_rspec_generator.rb
 test/test_install_test_unit_generator.rb
 test/test_model_generator.rb
-test/test_rbiphonetest.rb
 test/test_rbiphonetest_generator.rb
 test/test_story_generator.rb

data/README.rdoc

@@ -68,7 +68,7 @@ From source:
 
 (The MIT License)
 
-Copyright (c) 2008 Dr Nic Williams
+Copyright (c) 2008-9 Dr Nic Williams
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,4 +1,24 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/rbiphonetest'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.new('rbiphonetest', RbIphoneTest::VERSION) do |p|
+  p.developer('Dr Nic Williams', 'drnicwilliams@gmail.com')
+  p.changes              = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.post_install_message = 'PostInstall.txt'
+  p.extra_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
+  
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+task :default => [:features]

data/app_generators/rbiphonetest/rbiphonetest_generator.rb

@@ -6,14 +6,15 @@ class RbiphonetestGenerator < RubiGen::Base
   default_options :author => nil,
                   :test_framework => 'test_unit'
 
-  attr_reader :name
+  attr_reader :name, :module_name
   attr_reader :test_framework
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
     @destination_root = File.expand_path(args.shift)
-    @name = base_name
+    @name             = base_name.gsub("-", "_")
+    @module_name      = name.camelize
     extract_options
   end
 
@@ -24,8 +25,10 @@ class RbiphonetestGenerator < RubiGen::Base
       BASEDIRS.each { |path| m.directory path }
 
       # Create stubs
-      m.file_copy_each ["Rakefile"]
-      m.file           "dot_autotest", ".autotest"
+      m.template_copy_each ["Rakefile"]
+      m.file    "dot_autotest", ".autotest"
+      m.template "Classes/module.m.erb", "Classes/#{module_name}.m"
+      m.template "Classes/module.h.erb", "Classes/#{module_name}.h"
       
       # Selecting a test framework
       case test_framework
@@ -75,4 +78,4 @@ EOS
       Classes
       tasks
     )
-end
+end

data/app_generators/rbiphonetest/templates/Classes/module.h.erb

@@ -0,0 +1 @@
+/* <%= module_name %> */

data/app_generators/rbiphonetest/templates/Classes/module.m.erb

@@ -0,0 +1,3 @@
+#import "<%= module_name %>.h"
+
+void Init_<%= module_name %>() { }

data/app_generators/rbiphonetest/templates/Rakefile

@@ -1,6 +1,12 @@
 require "rubygems"
 require "rake"
 
+bundle_name    = '<%= module_name %>'
+src_paths      = %w[Classes] # any included projects, add folders here
+src_files      = FileList['Classes/**/*.m'] # any included projects, add files here
+req_frameworks = %w[Foundation] # use only frameworks available to both Cocoa + iPhone SDKs
+req_libraries  = %w[] # e.g. add sqlite3 for libsqlite3 to be used by linking step
+
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 namespace :objc do
@@ -10,31 +16,40 @@ end
 
 task :compile => "objc:compile"
 
-namespace :objc do
-  # look for Classes/*.m files containing a line "void Init_ClassName"
-  # These are the primary classes for bundles; make a bundle for each
-  model_file_paths = `find Classes/*.m -exec grep -l "^void Init_" {} \\;`.split("\n")
-  model_file_paths.each do |path|
-    path =~ /Classes\/(.*)\.m/
-    model_name = $1
-
-    task :compile => model_name do
-      if Dir.glob("**/#{model_name}.bundle").length == 0
-        STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-        STDERR.puts "Bundle actually failed to build."
-        STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-        exit(1)
-      end
-    end
+# Converts ('-I', ['foo', 'bar'])
+# Into: -Ifoo -Ibar
+def make_options(flag, items)
+  items.map { |item| "#{flag}#{item}" }.join(" ")
+end
 
-    task model_name.to_sym => "build/bundles/#{model_name}.bundle"
+src_files.each do |file|
+  FileUtils.mkdir_p "build"
+  base = file.gsub(/\.m$/,'')
+  dot_o = "build/#{File.basename base}.o"
+  file dot_o => ["#{base}.m", "#{base}.h"] do
+    sh "gcc -c #{base}.m -o #{dot_o} #{make_options '-I', src_paths}"
+  end
+end
+
+dot_o_files = src_files.map { |file| "build/" + File.basename(file).gsub(/\.m$/,'') + ".o" }
 
-    file "build/bundles/#{model_name}.bundle" => ["Classes/#{model_name}.m", "Classes/#{model_name}.h"] do |t|
-      FileUtils.mkdir_p "build/bundles"
-      FileUtils.rm Dir["build/bundles/#{model_name}.bundle"]
-      sh "gcc -o build/bundles/#{model_name}.bundle -bundle -framework Foundation Classes/#{model_name}.m"
+namespace :objc do
+  task :compile => "build/bundles/#{bundle_name}.bundle" do
+    if Dir.glob("**/#{bundle_name}.bundle").length == 0
+      STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+      STDERR.puts "Bundle actually failed to build."
+      STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+      exit(1)
     end
   end
 
+  file "build/bundles/#{bundle_name}.bundle" => dot_o_files do |t|
+    FileUtils.mkdir_p "build/bundles"
+    FileUtils.rm Dir["build/bundles/#{bundle_name}.bundle"]
+    sh "gcc -o build/bundles/#{bundle_name}.bundle #{dot_o_files.join(" ")} -bundle " +
+      "#{make_options '-framework ', req_frameworks} " +
+      "#{make_options '-l', req_libraries} " +
+      "#{make_options '-I', src_paths}"
+  end
 end
 

data/app_generators/rbiphonetest/templates/dot_autotest

@@ -9,7 +9,7 @@ end
 
 Autotest.add_hook :initialize do |at|
   at.add_mapping(/Classes\/(.*)\.[mh]/) do |_, m|
-    ["test/test_#{m[1].underscore}.rb"]
+    ["spec/#{m[1].underscore}_spec.rb", "test/test_#{m[1].underscore}.rb"]
   end
 end
 

data/bin/rbiphonetest

@@ -5,14 +5,16 @@ require 'rubigen'
 
 if %w(-v --version).include? ARGV.first
   require 'rbiphonetest/version'
-  puts "#{File.basename($0)} #{Iphoneruby::VERSION::STRING}"
+  puts "#{File.basename($0)} #{RbIphoneTest::VERSION::STRING}"
   exit(0)
 end
 
 require 'rubigen/scripts/generate'
 RubiGen::Base.reset_sources
-source = RubiGen::PathSource.new(:application, File.join(File.dirname(__FILE__), "../app_generators"))
-RubiGen::Base.append_sources source
-source = RubiGen::PathSource.new(:application, File.join(File.dirname(__FILE__), "../rbiphonetest_generators"))
-RubiGen::Base.append_sources source
+RubiGen::Base.use_application_sources! :rubygems
+RubiGen::Base.prepend_sources(*[ 
+  RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "app_generators")),
+  RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "rbiphonetest_generators"))
+])
+
 RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'rbiphonetest')

data/features/development.feature

@@ -0,0 +1,13 @@
+Feature: Development processes of newgem itself (rake tasks)
+
+  As a Newgem maintainer or contributor
+  I want rake tasks to maintain and release the gem
+  So that I can spend time on the tests and code, and not excessive time on maintenance processes
+    
+  Scenario: Generate RubyGem
+    Given this project is active project folder
+    And 'pkg' folder is deleted
+    When I invoke task 'rake gem'
+    Then folder 'pkg' is created
+    And file with name matching 'pkg/*.gem' is created else you should run "rake manifest" to fix this
+    And gem spec key 'rdoc_options' contains /--mainREADME.rdoc/

data/features/models.feature

@@ -0,0 +1,35 @@
+Feature: Generate, compile and test Objective-C classes with Ruby tests
+  In order to reduce the cost of development and maintenance of Objective-C projects
+  As an Objective-C developer
+  I want a generator for new Objective-C models/classes that are covered by Ruby tests
+
+  Scenario: Generate a single model and its default tests should pass
+    Given an existing rbiphonetest scaffold using options '' [called 'my_project']
+    When I invoke 'model' generator with arguments 'Person'
+    Then file 'Classes/Person.m' is created
+    And file 'Classes/Person.h' is created
+    And file 'test/test_person.rb' is created
+    When I invoke task 'rake test'
+    Then all 1 tests pass
+  
+  Scenario: Generate a single model and its default tests should pass, for rspec project
+    Given an existing rbiphonetest scaffold using options '--test-with=rspec' [called 'my_project']
+    When I invoke 'model' generator with arguments 'Person'
+    Then file 'Classes/Person.m' is created
+    And file 'Classes/Person.h' is created
+    And file 'spec/person_spec.rb' is created
+    When I invoke task 'rake spec'
+    Then all 1 examples pass
+
+  Scenario: Generate multiple models and its tests should pass
+    Given an existing rbiphonetest scaffold using options '' [called 'my_project']
+    When I invoke 'model' generator with arguments 'Person'
+    When I invoke 'model' generator with arguments 'Company'
+    Then file 'Classes/Person.m' is created
+    And file 'Classes/Person.h' is created
+    And file 'test/test_person.rb' is created
+    Then file 'Classes/Company.m' is created
+    And file 'Classes/Company.h' is created
+    And file 'test/test_company.rb' is created
+    When I invoke task 'rake test'
+    Then all 2 tests pass

data/features/new_project.feature

@@ -0,0 +1,30 @@
+Feature: Created a new Objective-C project that can be tested by Ruby tests
+  In order to reduce the cost of development and maintenance of Objective-C projects
+  As an Objective-C developer
+  I want a generator for new Objective-C libraries that are covered by Ruby tests
+
+  Scenario: Generate new project (defaults test/unit)
+    Given a safe folder
+    When I execute rbiphonetest for project 'my_project' with options ''
+    Then file 'Rakefile' is created
+    And file 'Classes/MyProject.h' is created
+    And file 'Classes/MyProject.m' is created
+    And file 'Classes/MyProject.m' contents does match /void Init_MyProject\(\) \{ \}/
+    And file 'Classes/MyProject.m' contents does match /#import "MyProject.h"/
+    And Rakefile can display tasks successfully
+    And file 'test/test_helper.rb' is created
+  
+  Scenario: Generate new test/unit project
+    Given a safe folder
+    When I execute rbiphonetest for project 'my_project' with options '--test-with=test_unit'
+    Then file 'Rakefile' is created
+    And Rakefile can display tasks successfully
+    And file 'test/test_helper.rb' is created
+
+Scenario: Generate new rspec project
+    Given a safe folder
+    When I execute rbiphonetest for project 'my_project' with options '--test-with=rspec'
+    Then file 'Rakefile' is created
+    And Rakefile can display tasks successfully
+    And file 'spec/spec_helper.rb' is created
+

data/features/step_definitions/cli_steps.rb

@@ -0,0 +1,14 @@
+When /^I execute rbiphonetest for project '(.*)' with options '(.*)'/ do |project_name, arguments|
+  setup_active_project_folder project_name
+  in_tmp_folder do
+    @stdout = File.expand_path("newgem.out")
+    system "ruby #{rbiphonetest_cmd} #{arguments} #{project_name} > #{@stdout}"
+    force_local_lib_override
+  end
+end
+
+Given /^an existing rbiphonetest scaffold using options '(.*)' \[called '(.*)'\]/ do |arguments, project_name|
+  Given "a safe folder"
+  Given "I execute rbiphonetest for project '#{project_name}' with options '#{arguments}'"
+end
+

data/features/step_definitions/common_steps.rb

@@ -0,0 +1,170 @@
+Given /^a safe folder/ do
+  FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
+  FileUtils.mkdir_p @tmp_root
+  FileUtils.mkdir_p @home_path = File.expand_path(File.join(@tmp_root, "home"))
+  @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
+  Given "env variable $HOME set to '#{@home_path}'"
+end
+
+Given /^this project is active project folder/ do
+  Given "a safe folder"
+  @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
+end
+
+Given /^env variable \$([\w_]+) set to '(.*)'/ do |env_var, value|
+  ENV[env_var] = value
+end
+
+Given /'(.*)' folder is deleted/ do |folder|
+  in_project_folder { FileUtils.rm_rf folder }
+end
+
+When /^I invoke '(.*)' generator with arguments '(.*)'$/ do |generator, arguments|
+  @stdout = StringIO.new
+  FileUtils.chdir(@active_project_folder) do
+    if Object.const_defined?("APP_ROOT")
+      APP_ROOT.replace(FileUtils.pwd)
+    else 
+      APP_ROOT = FileUtils.pwd
+    end
+    run_generator(generator, arguments.split(' '), SOURCES, :stdout => @stdout)
+  end
+  File.open(File.join(@tmp_root, "generator.out"), "w") do |f|
+    @stdout.rewind
+    f << @stdout.read
+  end
+end
+
+When /^I run executable '(.*)' with arguments '(.*)'/ do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  in_project_folder do
+    system "#{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+  end
+end
+
+When /^I run project executable '(.*)' with arguments '(.*)'/ do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  in_project_folder do
+    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+  end
+end
+
+When /^I run local executable '(.*)' with arguments '(.*)'/ do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  executable = File.expand_path(File.join(File.dirname(__FILE__), "/../../bin", executable))
+  in_project_folder do
+    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+  end
+end
+
+When /^I invoke task 'rake (.*)'/ do |task|
+  @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
+  FileUtils.chdir(@active_project_folder) do
+    system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
+  end
+end
+
+Then /^folder '(.*)' (is|is not) created/ do |folder, is|
+  in_project_folder do
+    File.exists?(folder).should(is == 'is' ? be_true : be_false)
+  end
+end
+
+Then /^file '(.*)' (is|is not) created/ do |file, is|
+  in_project_folder do
+    File.exists?(file).should(is == 'is' ? be_true : be_false)
+  end
+end
+
+Then /^file with name matching '(.*)' is created/ do |pattern|
+  in_project_folder do
+    Dir[pattern].should_not be_empty
+  end
+end
+
+Then /^file '(.*)' contents (does|does not) match \/(.*)\// do |file, does, regex|
+  in_project_folder do
+    actual_output = File.read(file)
+    (does == 'does') ?
+      actual_output.should(match(/#{regex}/)) :
+      actual_output.should_not(match(/#{regex}/))
+  end
+end
+
+Then /gem file '(.*)' and generated file '(.*)' should be the same/ do |gem_file, project_file|
+  File.exists?(gem_file).should be_true
+  File.exists?(project_file).should be_true
+  gem_file_contents = File.read(File.dirname(__FILE__) + "/../../#{gem_file}")
+  project_file_contents = File.read(File.join(@active_project_folder, project_file))
+  project_file_contents.should == gem_file_contents
+end
+
+Then /^output same as contents of '(.*)'$/ do |file|
+  expected_output = File.read(File.join(File.dirname(__FILE__) + "/../expected_outputs", file))
+  actual_output = File.read(@stdout)
+  actual_output.should == expected_output
+end
+
+Then /^(does|does not) invoke generator '(.*)'$/ do |does_invoke, generator|
+  actual_output = File.read(@stdout)
+  does_invoke == "does" ?
+    actual_output.should(match(/dependency\s+#{generator}/)) :
+    actual_output.should_not(match(/dependency\s+#{generator}/))
+end
+
+Then /help options '(.*)' and '(.*)' are displayed/ do |opt1, opt2|
+  actual_output = File.read(@stdout)
+  actual_output.should match(/#{opt1}/)
+  actual_output.should match(/#{opt2}/)
+end
+
+Then /^output (does|does not) match \/(.*)\// do |does, regex|
+  actual_output = File.read(@stdout)
+  (does == 'does') ?
+    actual_output.should(match(/#{regex}/)) :
+    actual_output.should_not(match(/#{regex}/)) 
+end
+
+Then /^all (\d+) tests pass/ do |expected_test_count|
+  expected = %r{^#{expected_test_count} tests, \d+ assertions, 0 failures, 0 errors}
+  actual_output = File.read(@stdout)
+  actual_output.should match(expected)
+end
+
+Then /^all (\d+) examples pass/ do |expected_test_count|
+  expected = %r{^#{expected_test_count} examples?, 0 failures}
+  actual_output = File.read(@stdout)
+  actual_output.should match(expected)
+end
+
+Then /^yaml file '(.*)' contains (\{.*\})/ do |file, yaml|
+  in_project_folder do
+    yaml = eval yaml
+    YAML.load(File.read(file)).should == yaml
+  end
+end
+
+Then /^Rakefile can display tasks successfully/ do
+  @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
+  FileUtils.chdir(@active_project_folder) do
+    system "rake -T > #{@stdout} 2> #{@stdout}"
+  end
+  actual_output = File.read(@stdout)
+  actual_output.should match(/^rake\s+\w+\s+#\s.*/)
+end
+
+Then /^task 'rake (.*)' is executed successfully/ do |task|
+  @stdout.should_not be_nil
+  actual_output = File.read(@stdout)
+  actual_output.should_not match(/^Don't know how to build task '#{task}'/)
+  actual_output.should_not match(/Error/i)
+end
+
+Then /^gem spec key '(.*)' contains \/(.*)\// do |key, regex|
+  in_project_folder do
+    gem_file = Dir["pkg/*.gem"].first
+    gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)
+    spec_value = gem_spec.send(key.to_sym)
+    spec_value.to_s.should match(/#{regex}/)
+  end
+end

data/features/support/cli.rb

@@ -0,0 +1,8 @@
+module CliHelpers
+  def rbiphonetest_cmd
+    @rbiphonetest_cmd ||= File.expand_path(File.dirname(__FILE__) + "/../../../bin/rbiphonetest")
+  end
+end
+
+World { |world| world.extend CliHelpers }
+

data/features/support/common.rb

@@ -0,0 +1,29 @@
+module CommonHelpers
+  def in_tmp_folder(&block)
+    FileUtils.chdir(@tmp_root, &block)
+  end
+
+  def in_project_folder(&block)
+    project_folder = @active_project_folder || @tmp_root
+    FileUtils.chdir(project_folder, &block)
+  end
+
+  def in_home_folder(&block)
+    FileUtils.chdir(@home_path, &block)
+  end
+
+  def force_local_lib_override(project_name = @project_name)
+    rakefile = File.read(File.join(project_name, 'Rakefile'))
+    File.open(File.join(project_name, 'Rakefile'), "w+") do |f|
+      f << "$:.unshift('#{@lib_path}')\n"
+      f << rakefile
+    end
+  end
+
+  def setup_active_project_folder project_name
+    @active_project_folder = File.join(@tmp_root, project_name)
+    @project_name = project_name
+  end
+end
+
+World { |world| world.extend CommonHelpers }

data/features/support/env.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + "/../../lib/rbiphonetest"
+
+gem 'cucumber'
+require 'cucumber'
+gem 'rspec'
+require 'spec'
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/helpers/generator_test_helper'
+include RubiGen::GeneratorTestHelper
+
+SOURCES = Dir[File.dirname(__FILE__) + "/../../*_generators"].map do |f|
+  RubiGen::PathSource.new(:test, File.expand_path(f))
+end

data/lib/rbiphonetest.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RbIphoneTest
-  
+  VERSION = '0.4.0'
 end

data/lib/rbiphonetest/version.rb

@@ -1,7 +1,7 @@
 module RbIphoneTest
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/rbiphonetest_generators/install_rspec/install_rspec_generator.rb

@@ -2,12 +2,13 @@ class InstallRspecGenerator < RubiGen::Base
 
   default_options :author => nil
 
-  attr_reader :name
+  attr_reader :name, :module_name
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
     @name = args.shift
+    @module_name = File.basename(destination_root).gsub("-", "_").camelize
     extract_options
   end
 
@@ -17,7 +18,7 @@ class InstallRspecGenerator < RubiGen::Base
       m.directory 'spec'
       m.directory 'tasks'
 
-      m.file_copy_each ["spec/spec_helper.rb"]
+      m.template_copy_each ["spec/spec_helper.rb"]
       m.file_copy_each ["tasks/rspec.rake"]
     end
   end

data/rbiphonetest_generators/install_rspec/templates/spec/spec_helper.rb

@@ -1,3 +1,7 @@
 require "osx/cocoa"
 
-$:.unshift File.dirname(__FILE__) + "/../build/bundles"
+$:.unshift File.dirname(__FILE__) + "/../build/bundles"
+
+bundle_name = '<%= module_name %>'
+require "#{bundle_name}.bundle"
+OSX::ns_import bundle_name.to_sym

data/rbiphonetest_generators/install_test_unit/install_test_unit_generator.rb

@@ -2,12 +2,13 @@ class InstallTestUnitGenerator < RubiGen::Base
 
   default_options :author => nil
 
-  attr_reader :name
+  attr_reader :name, :module_name
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
     @name = args.shift
+    @module_name = File.basename(destination_root).gsub("-", "_").camelize
     extract_options
   end
 
@@ -17,7 +18,7 @@ class InstallTestUnitGenerator < RubiGen::Base
       m.directory 'test'
       m.directory 'tasks'
 
-      m.file_copy_each ["test/test_helper.rb"]
+      m.template_copy_each ["test/test_helper.rb"]
       m.file_copy_each ["tasks/test_unit.rake"]
       
     end

data/rbiphonetest_generators/install_test_unit/templates/test/test_helper.rb

@@ -1,4 +1,8 @@
 require "test/unit"
 require "osx/cocoa"
 
-$:.unshift File.dirname(__FILE__) + "/../build/bundles"
+$:.unshift File.dirname(__FILE__) + "/../build/bundles"
+
+bundle_name = '<%= module_name %>'
+require "#{bundle_name}.bundle"
+OSX::ns_import bundle_name.to_sym

data/rbiphonetest_generators/model_rspec/templates/spec.rb

@@ -1,8 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-require "<%= class_name %>.bundle"
-OSX::ns_import :<%= class_name %>
-
 describe OSX::<%= class_name %> do
   
   it "should exist" do

data/rbiphonetest_generators/model_test_unit/model_test_unit_generator.rb

@@ -7,8 +7,8 @@ class ModelTestUnitGenerator < RubiGen::Base
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
-    @name = args.shift.underscore
-    @class_name = @name.camelcase
+    @name        = args.shift.underscore
+    @class_name  = @name.camelcase
     extract_options
   end
 
@@ -48,4 +48,4 @@ EOS
       # raw instance variable value.
       # @author = options[:author]
     end
-end
+end

data/rbiphonetest_generators/model_test_unit/templates/test.rb

@@ -1,8 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-require "<%= class_name %>.bundle"
-OSX::ns_import :<%= class_name %>
-
 class Test<%= class_name %> < Test::Unit::TestCase
   def test_<%= name %>_class_exists
     OSX::<%= class_name %>

data/test/test_generator_helper.rb

@@ -7,7 +7,7 @@ require 'fileutils'
 
 # Must set before requiring generator libs.
 TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
-PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
+PROJECT_NAME = "my_project" unless defined?(PROJECT_NAME)
 app_root = File.join(TMP_ROOT, PROJECT_NAME)
 if defined?(APP_ROOT)
   APP_ROOT.replace(app_root)

data/test/test_rbiphonetest_generator.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
 
-class TestIphonerubyGenerator < Test::Unit::TestCase
+class TestRbIphoneTestGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
@@ -32,6 +32,8 @@ class TestIphonerubyGenerator < Test::Unit::TestCase
     assert_directory_exists "tasks"
     assert_generated_file   ".autotest"
     assert_generated_file   "Rakefile"
+    assert_generated_file   "Classes/MyProject.h"
+    assert_generated_file   "Classes/MyProject.m"
     assert_generated_file   "test/test_helper.rb"
     assert_generated_file   "script/generate"
   end
@@ -39,10 +41,12 @@ class TestIphonerubyGenerator < Test::Unit::TestCase
   def test_generator_with_rspec
     run_generator('rbiphonetest', [APP_ROOT], sources, {:test_framework => 'rspec'})
     assert_directory_exists "Classes"
-    assert_directory_exists "test"
+    assert_directory_exists "spec"
     assert_directory_exists "tasks"
     assert_generated_file   ".autotest"
     assert_generated_file   "Rakefile"
+    assert_generated_file   "Classes/MyProject.h"
+    assert_generated_file   "Classes/MyProject.m"
     assert_generated_file   "spec/spec_helper.rb"
     assert_generated_file   "script/generate"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbiphonetest
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-08 00:00:00 +10:00
+date: 2009-03-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -20,9 +30,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
-description: Want to write iPhone unit tests? Want to write them in Ruby?
+description: "Want to write iPhone apps with unit tests? Want to write them in Ruby?  * Blog introduction: http://drnicwilliams.com/2008/07/04/unit-testing-iphone-apps-with-ruby-rbiphonetest/ * Video introduction: http://www.vimeo.com/1262916 * Google Group: http://groups.google.com/group/rbiphonetest * Bugs/Features: http://drnic.lighthouseapp.com/projects/13763-rbiphonetest"
 email: 
 - drnicwilliams@gmail.com
 executables: 
@@ -32,24 +42,31 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- License.txt
 - Manifest.txt
 - PostInstall.txt
+- README.rdoc
 files: 
 - History.txt
-- License.txt
 - Manifest.txt
 - PostInstall.txt
 - README.rdoc
 - Rakefile
 - app_generators/rbiphonetest/USAGE
 - app_generators/rbiphonetest/rbiphonetest_generator.rb
+- app_generators/rbiphonetest/templates/Classes/module.h.erb
+- app_generators/rbiphonetest/templates/Classes/module.m.erb
 - app_generators/rbiphonetest/templates/Rakefile
 - app_generators/rbiphonetest/templates/dot_autotest
 - bin/iphoneruby
 - bin/rbiphonetest
-- config/hoe.rb
-- config/requirements.rb
+- features/development.feature
+- features/models.feature
+- features/new_project.feature
+- features/step_definitions/cli_steps.rb
+- features/step_definitions/common_steps.rb
+- features/support/cli.rb
+- features/support/common.rb
+- features/support/env.rb
 - lib/rbiphonetest.rb
 - lib/rbiphonetest/version.rb
 - rbiphonetest_generators/install_rspec/USAGE
@@ -79,44 +96,19 @@ files:
 - script/generate
 - script/txt2html
 - setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
 - test/test_generator_helper.rb
 - test/test_helper.rb
 - test/test_install_rspec_generator.rb
 - test/test_install_test_unit_generator.rb
 - test/test_model_generator.rb
-- test/test_rbiphonetest.rb
 - test/test_rbiphonetest_generator.rb
 - test/test_story_generator.rb
 has_rdoc: true
-homepage: http://github.com/drnic/rbiphonetest
-post_install_message: |-
-  
-  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:
-  
-  	rbiphonetest .
-  
-  This adds the test framework, a Rakefile, and an `autotest` config file.
-  
-  You can now create testable Objective-C models/classes using the generator:
-  	
-  	$ script/generate model WidgetMaker
-  		  create  Classes/WidgetMaker.h
-  		  create  Classes/WidgetMaker.m
-  		  create  test/test_widget_maker.rb
-  
-  To run tests you have several options:
-  	
-  1. `rake` or `rake test`
-  1. `autotest` (after installing the ZenTest gem)
-  
-  Enjoy iPhone development with Ruby!
+homepage: http://rbiphonetest.rubyforge.org
+post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -134,16 +126,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rbiphonetest
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Want to write iPhone unit tests? Want to write them in Ruby?
+summary: "Want to write iPhone apps with unit tests? Want to write them in Ruby?  * Blog introduction: http://drnicwilliams.com/2008/07/04/unit-testing-iphone-apps-with-ruby-rbiphonetest/ * Video introduction: http://www.vimeo.com/1262916 * Google Group: http://groups.google.com/group/rbiphonetest * Bugs/Features: http://drnic.lighthouseapp.com/projects/13763-rbiphonetest"
 test_files: 
 - test/test_generator_helper.rb
 - test/test_helper.rb
 - test/test_install_rspec_generator.rb
 - test/test_install_test_unit_generator.rb
 - test/test_model_generator.rb
-- test/test_rbiphonetest.rb
 - test/test_rbiphonetest_generator.rb
 - test/test_story_generator.rb

data/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008 Dr Nic Williams
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/config/hoe.rb

@@ -1,70 +0,0 @@
-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 = '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']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-VERS = RbIphoneTest::VERSION::STRING
-RDOC_OPTS = ['--quiet', '--title', 'rbiphonetest documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -1,15 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/tasks/deployment.rake

@@ -1,34 +0,0 @@
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
-  puts "Remember to create SVN tag:"
-  puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
-  puts "Suggested comment:"
-  puts "Tagging release #{CHANGES}"
-end
-
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
-
-task :check_version do
-  unless ENV['VERSION']
-    puts 'Must pass a VERSION=x.y.z release version'
-    exit
-  end
-  unless ENV['VERSION'] == VERS
-    puts "Please update your version.rb to match the release version, currently #{VERS}"
-    exit
-  end
-end
-
-desc 'Install the package as a gem, without generating documentation(ri/rdoc)'
-task :install_gem_no_doc => [:clean, :package] do
-  sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
-end
-
-namespace :manifest do
-  desc 'Recreate Manifest.txt to include ALL files'
-  task :refresh do
-    `rake check_manifest | patch -p0 > Manifest.txt`
-  end
-end

data/tasks/environment.rake

@@ -1,7 +0,0 @@
-task :ruby_env do
-  RUBY_APP = if RUBY_PLATFORM =~ /java/
-    "jruby"
-  else
-    "ruby"
-  end unless defined? RUBY_APP
-end

data/tasks/website.rake

@@ -1,17 +0,0 @@
-desc 'Generate website files'
-task :website_generate => :ruby_env do
-  (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
-    sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]

data/test/test_rbiphonetest.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestRbIphoneTest < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end