ritsu 0.7.0 → 0.7.1

data/lib/ritsu/targets.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/targets/executable')
-require File.expand_path(File.dirname(__FILE__) + '/targets/library')
-require File.expand_path(File.dirname(__FILE__) + '/targets/static_library')
+require File.expand_path(File.dirname(__FILE__) + '/targets/executable')
+require File.expand_path(File.dirname(__FILE__) + '/targets/library')
+require File.expand_path(File.dirname(__FILE__) + '/targets/static_library')
 require File.expand_path(File.dirname(__FILE__) + '/targets/shared_library')

data/lib/ritsu/targets/executable.rb

@@ -1,45 +1,45 @@
-require 'rubygems'
-require 'active_support'
-require File.expand_path(File.dirname(__FILE__) + '/../target')
-require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
-require File.expand_path(File.dirname(__FILE__) + '/../src_files/executable_cmake_lists')
-
-module Ritsu::Targets
-  class Executable < Ritsu::Target
-    attr_reader :cmake_lists
-    
-    def initialize(name, options={})
-      super(name, options)
-      @cmake_lists = Ritsu::SrcFiles::ExecutableCmakeLists.new(self)
-    end
-    
-    def can_be_depended_on?
-      false
-    end
-    
-    def executable?
-      true
-    end
-    
-    def shared_library?
-      false
-    end
-    
-    def static_library?
-      false
-    end
-    
-    def library?
-      false
-    end
-  end
-end
-
-module Ritsu
-  class Project
-    def add_executable(name)
-      executable = Ritsu::Targets::Executable.new(name, :project=>self)
-      yield executable if block_given?
-    end
-  end
+require 'rubygems'
+require 'active_support'
+require File.expand_path(File.dirname(__FILE__) + '/../target')
+require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
+require File.expand_path(File.dirname(__FILE__) + '/../src_files/executable_cmake_lists')
+
+module Ritsu::Targets
+  class Executable < Ritsu::Target
+    attr_reader :cmake_lists
+    
+    def initialize(name, options={})
+      super(name, options)
+      @cmake_lists = Ritsu::SrcFiles::ExecutableCmakeLists.new(self)
+    end
+    
+    def can_be_depended_on?
+      false
+    end
+    
+    def executable?
+      true
+    end
+    
+    def shared_library?
+      false
+    end
+    
+    def static_library?
+      false
+    end
+    
+    def library?
+      false
+    end
+  end
+end
+
+module Ritsu
+  class Project
+    def add_executable(name)
+      executable = Ritsu::Targets::Executable.new(name, :project=>self)
+      yield executable if block_given?
+    end
+  end
 end

data/lib/ritsu/targets/library.rb

@@ -1,29 +1,29 @@
-require File.expand_path(File.dirname(__FILE__) + "/../target")
-require File.expand_path(File.dirname(__FILE__) + "/../utility/accessors")
-
-module Ritsu::Targets
-  class Library < Ritsu::Target
-    include Ritsu::Utility::Accessors
-    
-    attr_accessor :cmake_depend_script
-    attr_method :cmake_depend_script
-    
-    def initialize(name, options={})
-      options = {:cmake_depend_script => ""}.merge(options)
-      super(name, options)
-      @cmake_depend_script = options[:cmake_depend_script]
-    end
-    
-    def can_be_depended_on?
-      true
-    end
-    
-    def executable?
-      false
-    end
-    
-    def library?
-      true
-    end
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + "/../target")
+require File.expand_path(File.dirname(__FILE__) + "/../utility/accessors")
+
+module Ritsu::Targets
+  class Library < Ritsu::Target
+    include Ritsu::Utility::Accessors
+    
+    attr_accessor :cmake_depend_script
+    attr_method :cmake_depend_script
+    
+    def initialize(name, options={})
+      options = {:cmake_depend_script => ""}.merge(options)
+      super(name, options)
+      @cmake_depend_script = options[:cmake_depend_script]
+    end
+    
+    def can_be_depended_on?
+      true
+    end
+    
+    def executable?
+      false
+    end
+    
+    def library?
+      true
+    end
+  end
+end

data/lib/ritsu/targets/shared_library.rb

@@ -1,39 +1,39 @@
-require 'rubygems'
-require 'active_support'
-require File.expand_path(File.dirname(__FILE__) + '/library')
-require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
-require File.expand_path(File.dirname(__FILE__) + '/../src_files/shared_library_cmake_lists')
-
-module Ritsu::Targets
-  class SharedLibrary < Ritsu::Targets::Library
-    attr_reader :cmake_lists
-    
-    def initialize(name, options={})
-      super(name, options)
-      initialize_cmake_lists
-    end
-    
-    protected
-    def initialize_cmake_lists
-      @cmake_lists = Ritsu::SrcFiles::SharedLibraryCmakeLists.new(self)
-    end
-      
-    public
-    def shared_library?
-      true
-    end
-    
-    def static_library?
-      false
-    end
-  end
-end
-
-module Ritsu
-  class Project
-    def add_shared_library(name)
-      shared_library = Ritsu::Targets::SharedLibrary.new(name, :project=>self)
-      yield shared_library if block_given?
-    end
-  end
+require 'rubygems'
+require 'active_support'
+require File.expand_path(File.dirname(__FILE__) + '/library')
+require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
+require File.expand_path(File.dirname(__FILE__) + '/../src_files/shared_library_cmake_lists')
+
+module Ritsu::Targets
+  class SharedLibrary < Ritsu::Targets::Library
+    attr_reader :cmake_lists
+    
+    def initialize(name, options={})
+      super(name, options)
+      initialize_cmake_lists
+    end
+    
+    protected
+    def initialize_cmake_lists
+      @cmake_lists = Ritsu::SrcFiles::SharedLibraryCmakeLists.new(self)
+    end
+      
+    public
+    def shared_library?
+      true
+    end
+    
+    def static_library?
+      false
+    end
+  end
+end
+
+module Ritsu
+  class Project
+    def add_shared_library(name)
+      shared_library = Ritsu::Targets::SharedLibrary.new(name, :project=>self)
+      yield shared_library if block_given?
+    end
+  end
 end

data/lib/ritsu/targets/static_library.rb

@@ -1,33 +1,33 @@
-require 'rubygems'
-require 'active_support'
-require File.expand_path(File.dirname(__FILE__) + '/library')
-require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
-require File.expand_path(File.dirname(__FILE__) + '/../src_files/static_library_cmake_lists')
-
-module Ritsu::Targets
-  class StaticLibrary < Ritsu::Targets::Library
-    attr_reader :cmake_lists
-    
-    def initialize(name, options={})
-      super(name, options)
-      @cmake_lists = Ritsu::SrcFiles::StaticLibraryCmakeLists.new(self)
-    end
-    
-    def shared_library?
-      false
-    end
-    
-    def static_library?
-      true
-    end
-  end
-end
-
-module Ritsu
-  class Project
-    def add_static_library(name)
-      static_library = Ritsu::Targets::StaticLibrary.new(name, :project=>self)
-      yield static_library if block_given?
-    end
-  end
+require 'rubygems'
+require 'active_support'
+require File.expand_path(File.dirname(__FILE__) + '/library')
+require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
+require File.expand_path(File.dirname(__FILE__) + '/../src_files/static_library_cmake_lists')
+
+module Ritsu::Targets
+  class StaticLibrary < Ritsu::Targets::Library
+    attr_reader :cmake_lists
+    
+    def initialize(name, options={})
+      super(name, options)
+      @cmake_lists = Ritsu::SrcFiles::StaticLibraryCmakeLists.new(self)
+    end
+    
+    def shared_library?
+      false
+    end
+    
+    def static_library?
+      true
+    end
+  end
+end
+
+module Ritsu
+  class Project
+    def add_static_library(name)
+      static_library = Ritsu::Targets::StaticLibrary.new(name, :project=>self)
+      yield static_library if block_given?
+    end
+  end
 end

data/lib/ritsu/template.rb

@@ -1,69 +1,69 @@
-require File.expand_path(File.dirname(__FILE__) + '/block')
-
-module Ritsu
-  class Template
-    include BlockMixin 
-    
-    def initialize(id = nil, options = {})
-      initialize_block_mixin(id, options)
-    end
-    
-    ##
-    # @return (Template) the first child template with the given ID. 
-    #   nil if there is no such child template.
-    def child_template_with_id(id)
-      contents.each do |content|
-        if content.kind_of?(Template) and content.id == id
-          return content
-        end
-      end
-      return nil
-    end
-    
-    ##
-    # @return (Template) the position of the child template with the given ID in the contents array. 
-    #   nil if there is no such child template.
-    def child_template_with_id_position(id)
-      contents.length.times do |i|
-        if contents[i].kind_of?(Template) and contents[i].id == id
-          return i
-        end
-      end
-      return nil
-    end
-    
-    def child_templates
-      contents.select {|x| x.kind_of?(Template)}
-    end
-    
-    def create_block(options={})
-      options = {}.merge(options)
-      options[:local_indentation] = local_indentation
-      block = Block.new(id, options)
-      contents.each do |content|
-        if !content.kind_of?(Template)
-          block.contents << content
-        else
-          block.contents << content.create_block(options)
-        end
-      end
-      block
-    end
-    
-    def update_block(block, options={})
-      raise NotImplementedError.new
-    end
-    
-    def add_template(template)
-      add_block_structure(template)
-    end
-    
-    def add_content(content)
-      if content.kind_of?(Template)
-        add_template(content)
-      else
-        add_line_or_other_content(content)
-      end
-    end
-  end
+require File.expand_path(File.dirname(__FILE__) + '/block')
+
+module Ritsu
+  class Template
+    include BlockMixin 
+    
+    def initialize(id = nil, options = {})
+      initialize_block_mixin(id, options)
+    end
+    
+    ##
+    # @return (Template) the first child template with the given ID. 
+    #   nil if there is no such child template.
+    def child_template_with_id(id)
+      contents.each do |content|
+        if content.kind_of?(Template) and content.id == id
+          return content
+        end
+      end
+      return nil
+    end
+    
+    ##
+    # @return (Template) the position of the child template with the given ID in the contents array. 
+    #   nil if there is no such child template.
+    def child_template_with_id_position(id)
+      contents.length.times do |i|
+        if contents[i].kind_of?(Template) and contents[i].id == id
+          return i
+        end
+      end
+      return nil
+    end
+    
+    def child_templates
+      contents.select {|x| x.kind_of?(Template)}
+    end
+    
+    def create_block(options={})
+      options = {}.merge(options)
+      options[:local_indentation] = local_indentation
+      block = Block.new(id, options)
+      contents.each do |content|
+        if !content.kind_of?(Template)
+          block.contents << content
+        else
+          block.contents << content.create_block(options)
+        end
+      end
+      block
+    end
+    
+    def update_block(block, options={})
+      raise NotImplementedError.new
+    end
+    
+    def add_template(template)
+      add_block_structure(template)
+    end
+    
+    def add_content(content)
+      if content.kind_of?(Template)
+        add_template(content)
+      else
+        add_line_or_other_content(content)
+      end
+    end
+  end
 end

data/lib/ritsu/template_policies.rb

@@ -1,133 +1,133 @@
-require File.expand_path(File.dirname(__FILE__) + '/template')
-
-module Ritsu::TemplatePolicies
-  module StrictBlockMatchingButLeaveUserTextBe
-    def update_block(block, options={})
-      child_blocks = block.child_blocks
-      index = 0
-      child_templates.each do |child_template|
-        while index < child_blocks.length && child_blocks[index].id != child_template.id
-          index += 1
-        end
-        if index >= child_blocks.length
-          if child_blocks.select {|x| x.id == child_template.id}
-            raise ArgumentError.new("block with id '#{child_template.id}' appears out of order")
-          else
-            raise ArgumentError.new("cannot find block with id '#{child_template.id}'")
-          end
-        end
-        child_template.update_block(child_blocks[index])
-        index += 1
-      end
-    end
-  end
-  
-  module Blank
-    def update_block(block, options={})
-      block.contents.clear
-    end
-  end
-  
-  module DoNotUpdate
-    def update_block(block, options={})
-    end
-  end
-  
-  module Overwrite
-    def overwrite_block(block, options={})
-      block.clear_contents
-      contents.each do |content|
-        if !content.kind_of?(Ritsu::Template)
-          block.add_content content
-        else
-          block.add_content(content.create_block(options))
-        end
-      end
-    end
-    
-    def update_block(block, options={})
-      overwrite_block(block, options)
-    end
-  end
-  
-  module FlexibleBlockMatching
-    ##
-    # @param (Block) a block
-    # @return (Hash) a hash mapping each child template to a child block with the same id.
-    #   If there is no such child block, the child template is mapped to nil.
-    def match_child_blocks(block)
-      child_blocks = block.child_blocks
-      matching_child_blocks = {}
-      child_templates.each do |child_template|
-        matching = nil
-        child_blocks.each do |child_block|
-          if child_template.id == child_block.id
-            matching = child_block
-            break
-          end
-        end
-        child_blocks.delete(matching) unless matching.nil?
-        matching_child_blocks[child_template] = matching
-      end
-      matching_child_blocks
-    end
-  end
-  
-  module FlexibleBlockMatchingAndCreateMissingBlocksButIgnoreUserText
-    include FlexibleBlockMatching
-    
-    def update_block(block, options={})
-      matching_child_blocks = match_child_blocks(block)
-      
-      block.contents.clear
-      contents.each do |content|
-        if content.kind_of?(Template)
-          if matching_child_blocks[content].nil?
-            block.contents << content.create_block(options)
-          else
-            matching = matching_child_blocks[content]
-            content.update_block(matching)
-            block.contents << matching
-          end
-        else
-          block.contents << content
-        end
-      end
-    end
-  end
-  
-  module FlexibleBlockMatchingAndCreateMissingBlockButLeaveUserTextBe
-    include FlexibleBlockMatching
-    
-    def update_block(block, options={})
-      options = {:new_line_after_block => true}.merge(options)
-      matching_child_blocks = match_child_blocks(block)
-      
-      child_templates.each do |child_template|
-        if matching_child_blocks[child_template].nil?
-          new_block = child_template.create_block(options)
-          
-          position = position_to_insert(block, new_block)
-          if position
-            block.contents.insert(position, new_block)
-            if options[:new_line_after_block]
-              block.contents.insert(position+1, "")
-            end
-          else
-            raise ArgumentError.new("cannot find position to insert '#{new_block.name}'")
-          end
-        else
-          matching = matching_child_blocks[child_template]
-          child_template.update_block(matching)
-        end
-      end
-    end
-    
-    ##
-    # @return (Integer) the position in block.contents to
-    #  insert the given new block
-    def position_to_insert(block, new_block)
-      raise NotImplementedError
-    end
-  end
+require File.expand_path(File.dirname(__FILE__) + '/template')
+
+module Ritsu::TemplatePolicies
+  module StrictBlockMatchingButLeaveUserTextBe
+    def update_block(block, options={})
+      child_blocks = block.child_blocks
+      index = 0
+      child_templates.each do |child_template|
+        while index < child_blocks.length && child_blocks[index].id != child_template.id
+          index += 1
+        end
+        if index >= child_blocks.length
+          if child_blocks.select {|x| x.id == child_template.id}
+            raise ArgumentError.new("block with id '#{child_template.id}' appears out of order")
+          else
+            raise ArgumentError.new("cannot find block with id '#{child_template.id}'")
+          end
+        end
+        child_template.update_block(child_blocks[index])
+        index += 1
+      end
+    end
+  end
+  
+  module Blank
+    def update_block(block, options={})
+      block.contents.clear
+    end
+  end
+  
+  module DoNotUpdate
+    def update_block(block, options={})
+    end
+  end
+  
+  module Overwrite
+    def overwrite_block(block, options={})
+      block.clear_contents
+      contents.each do |content|
+        if !content.kind_of?(Ritsu::Template)
+          block.add_content content
+        else
+          block.add_content(content.create_block(options))
+        end
+      end
+    end
+    
+    def update_block(block, options={})
+      overwrite_block(block, options)
+    end
+  end
+  
+  module FlexibleBlockMatching
+    ##
+    # @param (Block) a block
+    # @return (Hash) a hash mapping each child template to a child block with the same id.
+    #   If there is no such child block, the child template is mapped to nil.
+    def match_child_blocks(block)
+      child_blocks = block.child_blocks
+      matching_child_blocks = {}
+      child_templates.each do |child_template|
+        matching = nil
+        child_blocks.each do |child_block|
+          if child_template.id == child_block.id
+            matching = child_block
+            break
+          end
+        end
+        child_blocks.delete(matching) unless matching.nil?
+        matching_child_blocks[child_template] = matching
+      end
+      matching_child_blocks
+    end
+  end
+  
+  module FlexibleBlockMatchingAndCreateMissingBlocksButIgnoreUserText
+    include FlexibleBlockMatching
+    
+    def update_block(block, options={})
+      matching_child_blocks = match_child_blocks(block)
+      
+      block.contents.clear
+      contents.each do |content|
+        if content.kind_of?(Template)
+          if matching_child_blocks[content].nil?
+            block.contents << content.create_block(options)
+          else
+            matching = matching_child_blocks[content]
+            content.update_block(matching)
+            block.contents << matching
+          end
+        else
+          block.contents << content
+        end
+      end
+    end
+  end
+  
+  module FlexibleBlockMatchingAndCreateMissingBlockButLeaveUserTextBe
+    include FlexibleBlockMatching
+    
+    def update_block(block, options={})
+      options = {:new_line_after_block => true}.merge(options)
+      matching_child_blocks = match_child_blocks(block)
+      
+      child_templates.each do |child_template|
+        if matching_child_blocks[child_template].nil?
+          new_block = child_template.create_block(options)
+          
+          position = position_to_insert(block, new_block)
+          if position
+            block.contents.insert(position, new_block)
+            if options[:new_line_after_block]
+              block.contents.insert(position+1, "")
+            end
+          else
+            raise ArgumentError.new("cannot find position to insert '#{new_block.name}'")
+          end
+        else
+          matching = matching_child_blocks[child_template]
+          child_template.update_block(matching)
+        end
+      end
+    end
+    
+    ##
+    # @return (Integer) the position in block.contents to
+    #  insert the given new block
+    def position_to_insert(block, new_block)
+      raise NotImplementedError
+    end
+  end
 end