ritsu 0.7.0 → 0.7.1

data/lib/ritsu/test_helpers.rb

@@ -1,124 +1,124 @@
-require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + "/target")
-require File.expand_path(File.dirname(__FILE__) + "/src_file")
-require File.expand_path(File.dirname(__FILE__) + "/external_library")
-require File.expand_path(File.dirname(__FILE__) + "/project")
-
-module Ritsu
-  module SetupProjectAndClearEverythingElse
-    def setup_project(name='project')
-      Ritsu::Target.instances.clear
-      Ritsu::SrcFile.instances.clear
-      Ritsu::ExternalLibrary.instances.clear
-      @project = Ritsu::Project.create(name)
-    end
-  
-    def setup
-      setup_project
-    end
-  end
-
-  module TestCaseWithFileTestData
-    module ClassMethods
-      def file_test(name, &block)
-        case_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-        if !Ritsu::Utility::Strings::is_c_name?(case_name.to_s)
-          raise "'#{name}' does not yield a valid test case name (i.e., a C name)"
-        end
-        defined = instance_method(case_name) rescue false
-        raise "#{case_name} is already defined in #{self}" if defined
-        if block_given?
-          define_method(case_name) do
-            init_data_dir
-            instance_eval(&block)
-          end
-        else
-          define_method(case_name) do
-            flunk "No implmentation provided for #{case_name}"
-          end
-        end
-      end
-    end
-  
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-  
-    def init_data_dir
-      FileUtils.mkdir_p(data_dir)
-      FileUtils.mkdir_p(static_dir)
-      FileUtils.mkdir_p(output_dir)
-      FileUtils.rm_r(Dir.glob(output_dir + '/*'), :force=>true)
-    end
-  
-    def data_dir
-      raise NotImplementedError.new
-    end
-  
-    def data_path(path)
-      data_dir + '/' + path
-    end
-    
-    def output_dir
-      data_dir + '/output'
-    end
-  
-    def output_path(path)
-      output_dir + '/' + path
-    end
-  
-    def static_dir
-      data_dir + '/static'
-    end
-  
-    def static_path(path)
-      static_dir + '/' + path
-    end
-  
-    def assert_file_exists(filename)
-      assert_block "#{filename} must exists" do
-        File.exists?(filename)
-      end
-    end
-  
-    def assert_file_not_exist(filename)
-      assert_block "#{filename} must not exist" do
-        !File.exists?(filename)
-      end
-    end
-  
-    def assert_data_file_exists(filename)
-      assert_file_exists(data_path(filename))
-    end
-  
-    def assert_data_file_not_exist(filename)
-      assert_file_not_exist(data_path(filename))
-    end
-  
-    def assert_output_file_exists(filename)
-      assert_file_exists(output_path(filename))
-    end
-  
-    def assert_output_file_not_exist(filename)
-      assert_file_not_exist(output_path(filename))
-    end
-  
-    def assert_file_content(content, filename)
-      assert_equal content, IO.read(filename)
-        "content of #{filename} differs from expected"
-    end
-  
-    def assert_file_compare(expected_file, actual_file)
-      assert_equal IO.read(expected_file), IO.read(actual_file),
-        "content of #{actual_file} differs from #{expected_file}"
-    end
-  
-    def assert_output_file_compare_to_static(path)
-      assert_file_compare(static_path(path), output_path(path))
-    end
-  
-    def assert_output_file_content(content, path)
-      assert_file_content(content, output_path(path))
-    end
-  end
+require 'test/unit'
+require File.expand_path(File.dirname(__FILE__) + "/target")
+require File.expand_path(File.dirname(__FILE__) + "/src_file")
+require File.expand_path(File.dirname(__FILE__) + "/external_library")
+require File.expand_path(File.dirname(__FILE__) + "/project")
+
+module Ritsu
+  module SetupProjectAndClearEverythingElse
+    def setup_project(name='project')
+      Ritsu::Target.instances.clear
+      Ritsu::SrcFile.instances.clear
+      Ritsu::ExternalLibrary.instances.clear
+      @project = Ritsu::Project.create(name)
+    end
+  
+    def setup
+      setup_project
+    end
+  end
+
+  module TestCaseWithFileTestData
+    module ClassMethods
+      def file_test(name, &block)
+        case_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+        if !Ritsu::Utility::Strings::is_c_name?(case_name.to_s)
+          raise "'#{name}' does not yield a valid test case name (i.e., a C name)"
+        end
+        defined = instance_method(case_name) rescue false
+        raise "#{case_name} is already defined in #{self}" if defined
+        if block_given?
+          define_method(case_name) do
+            init_data_dir
+            instance_eval(&block)
+          end
+        else
+          define_method(case_name) do
+            flunk "No implmentation provided for #{case_name}"
+          end
+        end
+      end
+    end
+  
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+  
+    def init_data_dir
+      FileUtils.mkdir_p(data_dir)
+      FileUtils.mkdir_p(static_dir)
+      FileUtils.mkdir_p(output_dir)
+      FileUtils.rm_r(Dir.glob(output_dir + '/*'), :force=>true)
+    end
+  
+    def data_dir
+      raise NotImplementedError.new
+    end
+  
+    def data_path(path)
+      data_dir + '/' + path
+    end
+    
+    def output_dir
+      data_dir + '/output'
+    end
+  
+    def output_path(path)
+      output_dir + '/' + path
+    end
+  
+    def static_dir
+      data_dir + '/static'
+    end
+  
+    def static_path(path)
+      static_dir + '/' + path
+    end
+  
+    def assert_file_exists(filename)
+      assert_block "#{filename} must exists" do
+        File.exists?(filename)
+      end
+    end
+  
+    def assert_file_not_exist(filename)
+      assert_block "#{filename} must not exist" do
+        !File.exists?(filename)
+      end
+    end
+  
+    def assert_data_file_exists(filename)
+      assert_file_exists(data_path(filename))
+    end
+  
+    def assert_data_file_not_exist(filename)
+      assert_file_not_exist(data_path(filename))
+    end
+  
+    def assert_output_file_exists(filename)
+      assert_file_exists(output_path(filename))
+    end
+  
+    def assert_output_file_not_exist(filename)
+      assert_file_not_exist(output_path(filename))
+    end
+  
+    def assert_file_content(content, filename)
+      assert_equal content, IO.read(filename)
+        "content of #{filename} differs from expected"
+    end
+  
+    def assert_file_compare(expected_file, actual_file)
+      assert_equal IO.read(expected_file), IO.read(actual_file),
+        "content of #{actual_file} differs from #{expected_file}"
+    end
+  
+    def assert_output_file_compare_to_static(path)
+      assert_file_compare(static_path(path), output_path(path))
+    end
+  
+    def assert_output_file_content(content, path)
+      assert_file_content(content, output_path(path))
+    end
+  end
 end

data/lib/ritsu/thors/default_thor.rb

@@ -44,7 +44,7 @@ module Ritsu::Thors
         platform = platform.to_sym
         case platform
         when :windows
-          "Visual Studio 9 2008"
+          "Visual Studio 10"
         when :mac
           "Xcode"
         when :unix

data/lib/ritsu/utility.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/utility/strings')
-require File.expand_path(File.dirname(__FILE__) + '/utility/accessors')
-require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
-require File.expand_path(File.dirname(__FILE__) + '/utility/simple_io')
-require File.expand_path(File.dirname(__FILE__) + '/utility/file_robot')
-require File.expand_path(File.dirname(__FILE__) + '/utility/check_upon_add_set')
-require File.expand_path(File.dirname(__FILE__) + '/utility/files')
+require File.expand_path(File.dirname(__FILE__) + '/utility/strings')
+require File.expand_path(File.dirname(__FILE__) + '/utility/accessors')
+require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
+require File.expand_path(File.dirname(__FILE__) + '/utility/simple_io')
+require File.expand_path(File.dirname(__FILE__) + '/utility/file_robot')
+require File.expand_path(File.dirname(__FILE__) + '/utility/check_upon_add_set')
+require File.expand_path(File.dirname(__FILE__) + '/utility/files')
 require File.expand_path(File.dirname(__FILE__) + '/utility/platform')

data/lib/ritsu/utility/accessors.rb

@@ -1,30 +1,30 @@
-module Ritsu
-  module Utility
-    module Accessors
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-      
-      module ClassMethods
-        def attr_method_single(name)
-          name = name.to_s
-          module_eval <<-_RUBY
-            def #{name}(*args)
-              if args.length == 0
-                @#{name} ||= nil
-              elsif args.length == 1
-                @#{name} = args[0]
-              end
-            end 
-          _RUBY
-        end
-        
-        def attr_method(*names)
-          names.each do |name|
-            attr_method_single(name)
-          end
-        end
-      end
-    end
-  end
+module Ritsu
+  module Utility
+    module Accessors
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      
+      module ClassMethods
+        def attr_method_single(name)
+          name = name.to_s
+          module_eval <<-_RUBY
+            def #{name}(*args)
+              if args.length == 0
+                @#{name} ||= nil
+              elsif args.length == 1
+                @#{name} = args[0]
+              end
+            end 
+          _RUBY
+        end
+        
+        def attr_method(*names)
+          names.each do |name|
+            attr_method_single(name)
+          end
+        end
+      end
+    end
+  end
 end

data/lib/ritsu/utility/check_upon_add_set.rb

@@ -1,35 +1,35 @@
-require 'set'
-
-module Ritsu
-  module Utility
-    class CheckUponAddSet < Set
-      def initialize(*args, &block)
-        if block_given?
-          @check_block = block
-        else
-          @check_block = Proc.new { }
-        end
-        super(*args)
-      end
-    
-      def <<(x)
-        @check_block.call(self, x)
-        super(x)
-      end
-    
-      def add(x)
-        @check_block.call(self, x)
-        super(x)
-      end
-    
-      def add?(x)
-        begin
-          @check_block.call(self, x)
-          super(x)
-        rescue
-          nil
-        end
-      end
-    end
-  end
+require 'set'
+
+module Ritsu
+  module Utility
+    class CheckUponAddSet < Set
+      def initialize(*args, &block)
+        if block_given?
+          @check_block = block
+        else
+          @check_block = Proc.new { }
+        end
+        super(*args)
+      end
+    
+      def <<(x)
+        @check_block.call(self, x)
+        super(x)
+      end
+    
+      def add(x)
+        @check_block.call(self, x)
+        super(x)
+      end
+    
+      def add?(x)
+        begin
+          @check_block.call(self, x)
+          super(x)
+        rescue
+          nil
+        end
+      end
+    end
+  end
 end

data/lib/ritsu/utility/file_robot.rb

@@ -1,129 +1,129 @@
-require 'fileutils'
-require 'singleton'
-require File.expand_path(File.dirname(__FILE__) + '/../utility/simple_io')
-
-module Ritsu
-  module Utility
-    class FileRobot
-      include Singleton
-      def self.v; instance end
-    
-      def self.method_missing(symbol, *args, &block)
-        instance.send(symbol, *args, &block)
-      end
-    
-      attr_accessor :force
-      attr_reader :io
-    
-      def initialize
-        @io = SimpleIO.new
-        @force = false
-      end
-    
-      def output; io.output end
-      def output=(value); io.output = value end
-      def input; io.input end
-      def input=(value); io.input = value end
-      def quiet; io.quiet end
-      def quiet=(value); io.quiet = value end
-    
-      def quietly(&block)
-        old_quiet = self.quiet
-        self.quiet = true
-        block.call
-        self.quiet = old_quiet
-      end
-    
-      def verbosely(&block)
-        old_quiet = self.quiet
-        self.quiet = false
-        block.call
-        self.quiet = old_quiet
-      end
-    
-      def forcefully(&block)
-        old_force = self.force
-        self.force = true
-        block.call
-        self.force = old_force
-      end
-    
-      def create_dir(dir_name, options={})
-        options = {:echo_exists=>true}.merge(options)
-        if File.exists?(dir_name)
-          if options[:echo_exists]
-            io.log('exist', dir_name)
-          end
-        else
-          FileUtils.mkdir_p(dir_name)
-          io.log('create', dir_name)
-        end
-      end
-    
-      def create_file(filename, content="")
-        do_create_file = Proc.new do
-          File.open(filename, "w") { |f| f.write content }
-        end
-      
-        do_overwrite = Proc.new do
-          do_create_file.call
-          io.log('overwrite', filename)
-        end
-      
-        create_dir(File.dirname(filename), :echo_exists=>false)
-        if File.exists?(filename)
-          if self.force
-            do_overwrite.call
-          else
-            answer = io.ask_yes_no_all("overwrite #{filename}?")
-            case answer
-            when :yes
-              do_overwrite.call
-            when :no
-              io.log('exist', filename)
-            when :all
-              self.force = true
-              do_overwrite.call
-            end
-          end
-        else
-          do_create_file.call
-          io.log('create', filename)
-        end
-      end
-    
-      def remove_dir(dirname)      
-        if !File.exist?(dirname)
-          io.log("not exist", dirname)
-        elsif !File.directory?(dirname)
-          io.log("not dir", dirname)
-        else
-          begin
-            Dir.glob(dirname + "/*") { throw "not empty" }
-            is_empty = true
-          rescue
-            is_empty = false
-          end
-        
-          if !is_empty
-            io.log('not empty', dirname)
-          elsif
-            FileUtils.remove_dir(dirname)
-            io.log("remove", dirname)
-          end
-        end
-      end
-    
-      def remove_file(filename)
-        if !File.exists?(filename)
-          io.log("not exist", filename)
-        elsif !File.file?(filename)
-          io.log("not file", filename)
-        else
-          FileUtils.remove_file(filename)
-          io.log("remove", filename)
-        end
-      end
-    end
-  end
+require 'fileutils'
+require 'singleton'
+require File.expand_path(File.dirname(__FILE__) + '/../utility/simple_io')
+
+module Ritsu
+  module Utility
+    class FileRobot
+      include Singleton
+      def self.v; instance end
+    
+      def self.method_missing(symbol, *args, &block)
+        instance.send(symbol, *args, &block)
+      end
+    
+      attr_accessor :force
+      attr_reader :io
+    
+      def initialize
+        @io = SimpleIO.new
+        @force = false
+      end
+    
+      def output; io.output end
+      def output=(value); io.output = value end
+      def input; io.input end
+      def input=(value); io.input = value end
+      def quiet; io.quiet end
+      def quiet=(value); io.quiet = value end
+    
+      def quietly(&block)
+        old_quiet = self.quiet
+        self.quiet = true
+        block.call
+        self.quiet = old_quiet
+      end
+    
+      def verbosely(&block)
+        old_quiet = self.quiet
+        self.quiet = false
+        block.call
+        self.quiet = old_quiet
+      end
+    
+      def forcefully(&block)
+        old_force = self.force
+        self.force = true
+        block.call
+        self.force = old_force
+      end
+    
+      def create_dir(dir_name, options={})
+        options = {:echo_exists=>true}.merge(options)
+        if File.exists?(dir_name)
+          if options[:echo_exists]
+            io.log('exist', dir_name)
+          end
+        else
+          FileUtils.mkdir_p(dir_name)
+          io.log('create', dir_name)
+        end
+      end
+    
+      def create_file(filename, content="")
+        do_create_file = Proc.new do
+          File.open(filename, "w") { |f| f.write content }
+        end
+      
+        do_overwrite = Proc.new do
+          do_create_file.call
+          io.log('overwrite', filename)
+        end
+      
+        create_dir(File.dirname(filename), :echo_exists=>false)
+        if File.exists?(filename)
+          if self.force
+            do_overwrite.call
+          else
+            answer = io.ask_yes_no_all("overwrite #{filename}?")
+            case answer
+            when :yes
+              do_overwrite.call
+            when :no
+              io.log('exist', filename)
+            when :all
+              self.force = true
+              do_overwrite.call
+            end
+          end
+        else
+          do_create_file.call
+          io.log('create', filename)
+        end
+      end
+    
+      def remove_dir(dirname)      
+        if !File.exist?(dirname)
+          io.log("not exist", dirname)
+        elsif !File.directory?(dirname)
+          io.log("not dir", dirname)
+        else
+          begin
+            Dir.glob(dirname + "/*") { throw "not empty" }
+            is_empty = true
+          rescue
+            is_empty = false
+          end
+        
+          if !is_empty
+            io.log('not empty', dirname)
+          elsif
+            FileUtils.remove_dir(dirname)
+            io.log("remove", dirname)
+          end
+        end
+      end
+    
+      def remove_file(filename)
+        if !File.exists?(filename)
+          io.log("not exist", filename)
+        elsif !File.file?(filename)
+          io.log("not file", filename)
+        else
+          FileUtils.remove_file(filename)
+          io.log("remove", filename)
+        end
+      end
+    end
+  end
 end