iut 0.2.0 → 0.2.1

data/iut.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Katsuyoshi Ito"]
   s.email       = ["kito@itosoft.com"]
   s.homepage    = "https://github.com/katsuyoshi/iunittest"
-  s.summary     = %q{It generates a iUnitTest test project for Xcode 4.x.}
+  s.summary     = %q{It generates a iUnitTest test project for Xcode 4.x. Or set ARC compile flags. }
   s.description = %q{After Xcode 4 released, the format of template project was changed. The aim of this command is to make a iUnitTest test project easily. }
 
   s.rubyforge_project = "iut"

data/lib/iut.rb

@@ -13,21 +13,24 @@ opt = OptionParser.new
 opt.on('-p', '--project PROJECT', 'Set project path PROJECT.') {|v| v }
 
 opt.banner = <<EOF
-Usage: iut [command] [subcommand] [options] [TEST_PROJECT_NAME]
+Usage:
+  Makes a iUnitTest's empty project named TEST_PROJECT_NAME.
 
-Commands are:
-              Nothing command, makes a empty project of iUnitTest.
-              The project name is specified by TEST_PROJECT_NAME.
-  arc         Set a compile flag to use ARC. And scanned all files.
-              If a class doesn't use ARC, set a compile flag
-              -fno-objc-arc to the class.
-  arc revert  Revert a previous arc command
+    iut TEST_PROJECT_NAME
+  
+  Set the compile option Automatic Refarence counting to YES.
+  And scanned all files.
+  If a class doesn't use ARC, set a compile flag -fno-objc-arc to the class.
 
-ex)
- $ iut TestProject    It makes iUnitTest's empty project TestProject.
- $ iut arc            Set a compile flag to use ARC.
- $ iut arc revert     Revert a previous arc command.
+    iut arc [subcommand] [options] 
 
+  subcommands are:
+              Nothing subcommand, set compile flags of ARC.
+              It makes backup file.
+    revert    Revert a project from previous arc command's backup.
+    clean     Remove all backup files.
+
+  options are:
 EOF
 
 #opt.on('-h', '--help', 'show this help message and exit') {|v| }

data/lib/iut/arc.rb

@@ -17,34 +17,33 @@ module Iut
       
       super_name = "NSObject"
       
-      Dir.chdir self.project_path do
-        Dir.glob("**/#{class_name}\.[hm]") do |f|
-          context = File.read f
-          # remove comments
-          context.gsub! /\/\/.*\n/, ""
-          context.gsub! /\/\*.*\*\//m, ""
-          # remove spaces
-          context.gsub! /\s+/, " "
+      Dir.glob("**/#{class_name}\.[hm]") do |f|
+        context = File.read f
+        # remove comments
+        context.gsub! /\/\/.*\n/, ""
+        context.gsub! /\/\*.*\*\//m, ""
+        # remove spaces
+        context.gsub! /\s+/, " "
 
-          case f[-2, 2]
-          when /.h/i
-            # get a name of super class
-            a = context.scan(/@interface.*:\s(\S+)/)
-            super_name = a.first.first if a.first
-            
-            case context
-            when /@property\s*\(.*copy(\s*|\]|\))/,
-                 /@property\s*\(.*retain(\s*|\]|\))/
-              return true
-            end
-          when /.m/i
-            case context
-            when /\s+dealloc(\s*|\])/, /\s+autorelease(\s*|\])/,
-                 /\s+dealloc(\s*|\])/, /\s+release(\s*|\])/
-              return true
-            end
+        case f[-2, 2]
+        when /.h/i
+          # get a name of super class
+          a = context.scan(/@interface.*:\s(\S+)/)
+          super_name = a.first.first if a.first
+          
+          case context
+          when /@property\s*\(.*copy(\s*|\]|\))/,
+               /@property\s*\(.*retain(\s*|\]|\))/
+            return true
+          end
+        when /.m/i
+          case context
+          when /\s+dealloc(\s*|\])/, /\s+autorelease(\s*|\])/,
+               /\s+dealloc(\s*|\])/, /\s+release(\s*|\])/
+            return true
           end
         end
+
       end
       nonarc? super_name
     end
@@ -98,7 +97,23 @@ module Iut
           files << f if /project.pbxproj.\d{8}\-\d{6}/ =~ f
         end
         unless files.size == 0
-          FileUtils.cp files.sort.reverse.first, Dir.glob("**/project.pbxproj").first
+          f = files.sort.reverse.first
+          FileUtils.cp f, Dir.glob("**/project.pbxproj").first
+          FileUtils.rm f
+        end
+      end
+    end
+    
+    def clean
+      Dir.chdir self.project_path do
+        files = []
+        Dir.glob("**/project.pbxproj.*") do |f|
+          files << f if /project.pbxproj.\d{8}\-\d{6}/ =~ f
+        end
+        unless files.size == 0
+          files.each do |f|
+            FileUtils.rm f
+          end
         end
       end
     end
@@ -115,6 +130,8 @@ module Iut
       case ARGV[1]
       when /revert/
         arc.revert
+      when /clean/
+        arc.clean
       else
         arc.change_project_settings
       end

data/lib/iut/version.rb

@@ -1,4 +1,4 @@
 # -*- coding:UTF-8 -*-
 module Iut
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/test_arc.rb

@@ -14,6 +14,13 @@ class TestArc < Test::Unit::TestCase
     project_path = File.join(File.expand_path(File.dirname(__FILE__)), "files", "IUTTest")
     @arc = Iut::Arc.new
     @arc.project_path = project_path
+
+    @pwd = File.expand_path(Dir.pwd)
+    Dir.chdir @arc.project_path
+  end
+  
+  def teardown
+    Dir.chdir @pwd
   end
   
   

data/test/test_arc_change_settings.rb

@@ -8,13 +8,12 @@ $:.unshift(iut_path) unless
 require "arc"
 
 
-class TestArc < Test::Unit::TestCase
+class TestArcChangeSettings < Test::Unit::TestCase
 
   def setup
     project_path = File.join(File.expand_path(File.dirname(__FILE__)), "files", "IUTTest")
     @arc = Iut::Arc.new
     @arc.project_path = project_path
-#p project_path
   end
   
   def teardown
@@ -57,8 +56,7 @@ class TestArc < Test::Unit::TestCase
   def test_arc_make_backup
     @arc.change_project_settings
     Dir.chdir @arc.project_path do
-      files = Dir.glob("**/project.pbxproj.2*")
-      assert_equal 1, files.size
+      assert_equal 1, Dir.glob("**/project.pbxproj.2*").size
     end
   end
   
@@ -67,6 +65,15 @@ class TestArc < Test::Unit::TestCase
     @arc.revert
     Dir.chdir @arc.project_path do
       assert_equal File.read("IUTTest.xcodeproj/project.pbxproj.org"), File.read("IUTTest.xcodeproj/project.pbxproj")
+      assert_equal 0, Dir.glob("**/project.pbxproj.2*").size
+    end
+  end
+  
+  def test_clean
+    @arc.change_project_settings
+    @arc.clean
+    Dir.chdir @arc.project_path do
+      assert_equal 0, Dir.glob("**/project.pbxproj.2*").size
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iut
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -146,7 +146,7 @@ rubyforge_project: iut
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: It generates a iUnitTest test project for Xcode 4.x.
+summary: It generates a iUnitTest test project for Xcode 4.x. Or set ARC compile flags.
 test_files:
 - test/files/IUTTest/IUTTest.xcodeproj/project.pbxproj
 - test/files/IUTTest/IUTTest.xcodeproj/project.pbxproj.expected