ritsu 0.1.0 → 0.2.0

data/Thorfile

@@ -17,7 +17,7 @@ end.to_a + ['Thorfile']
 
 class Default < Thor
   include Thor::RakeCompat
-    
+      
   Rake::TestTask.new do |t|
     t.libs << 'lib'
     test_files = FileList['test/**/*_test.rb']
@@ -88,7 +88,14 @@ class Default < Thor
       s.add_development_dependency 'maruku', '>= 0.5.9'
     end
 
-    Jeweler::GemcutterTasks.new
+    Jeweler::GemcutterTasks.new    
+    
+    desc "fast_install", "Install gem without RI and RDoc"
+    def fast_install
+      build
+      version = File.read(File.dirname(__FILE__) + '/VERSION').strip
+      sh "gem install pkg/ritsu-#{version}.gem --no-ri --no-rdoc"
+    end
   rescue LoadError
     puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
   end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/ritsu/ext/fake_install/project.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + "/../../project"
+
+module Ritsu
+  class Project
+    def performs_fake_install?
+      @fake_install ||= false
+    end
+    
+    def fake_install=(value)
+      @fake_install = value
+    end
+    
+    def setup_fake_install
+      @fake_install = true
+    end
+  end
+end

data/lib/ritsu/ext/fake_install/src_files/project_cmake_lists.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + "/../../../src_files/project_cmake_lists"
+
+module Ritsu
+  module SrcFiles
+    class ProjectCmakeLists
+      class FakeInstallTemplate < Ritsu::Template
+        attr_reader :project
+        
+        def initialize(project)
+          super("ProjectCmakeLists -- Fake Install")
+          @project = project          
+        end
+        
+        def update_block(block, options={})
+          block.contents.clear
+          
+          to_install = project.targets.select { |x| x.install? }
+          
+          if project.performs_fake_install? && to_install.length > 0
+            block.add_line "ADD_CUSTOM_TARGET(fake_install"
+            block.add_line "    ALL"
+            block.add_line "    \"${CMAKE_COMMAND}\""
+            block.add_line "    -D CMAKE_INSTALL_PREFIX:string=${CMAKE_SOURCE_DIR}/../"
+            block.add_line "    -P \"${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake\""
+            block.add_line "    DEPENDS"
+            to_install.each do |target|
+              block.add_line "        #{target.name}"
+            end
+            block.add_line ")"
+          end
+        end
+      end      
+      
+      class Template
+        alias_method :initialize_before_fake_install, :initialize
+        
+        def initialize(project)
+          initialize_before_fake_install(project)
+          add_new_line
+          add_template FakeInstallTemplate.new(project)
+        end
+      end
+    end
+  end
+end

data/lib/ritsu/ext/fake_install.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + "/fake_install/project"
+require File.dirname(__FILE__) + "/fake_install/src_files/project_cmake_lists"

data/lib/ritsu/src_files/cpp_file.rb

@@ -18,6 +18,12 @@ module Ritsu
         src_path = compute_src_path(path, options)
         CppFile.new(src_path, self)
       end
+      
+      def add_cpp_files(*paths)
+        paths.each do |path|
+          add_cpp_file(path)
+        end
+      end
     end
   end
 end

data/lib/ritsu/src_files/header_file.rb

@@ -31,6 +31,12 @@ module Ritsu
         src_path = compute_src_path(path, options)
         HeaderFile.new(src_path, self)
       end
+      
+      def add_header_files(*paths)
+        paths.each do |path|
+          add_header_file(path)
+        end
+      end
     end
   end
 end

data/lib/ritsu/src_files/target_cmake_lists.rb

@@ -115,7 +115,29 @@ module Ritsu
           block.contents << ")"
         end
       end
-    
+      
+      class InstallTemplate < Ritsu::Template        
+        attr_reader :target
+        
+        def initialize(target)
+          super("TargetCmakeLists -- #{target.name} -- Install")
+          @target = target
+          
+        end
+        
+        def update_block(block, options = {})
+          block.contents.clear
+          
+          if target.install?
+            block.add_line "INSTALL(TARGETS #{target.name}"
+            block.add_line "    RUNTIME DESTINATION bin"
+            block.add_line "    LIBRARY DESTINATION lib"
+            block.add_line ")"
+          end
+        end
+        
+      end
+      
       class Template < Ritsu::Template
         include Ritsu::TemplatePolicies::FlexibleBlockMatchingAndCreateMissingBlockButLeaveUserTextBe
         attr_reader :target
@@ -123,6 +145,7 @@ module Ritsu
         attr_reader :custom_commands_template
         attr_reader :source_files_template
         attr_reader :dependencies_template
+        attr_reader :install_template
       
         def initialize(target, id = nil)
           super(id)
@@ -142,6 +165,10 @@ module Ritsu
         
           @dependencies_template = DependenciesTemplate.new(@target)
           contents << @dependencies_template
+          contents << ""
+          
+          @install_template = InstallTemplate.new(@target)
+          contents << @install_template
         end
       end
     

data/lib/ritsu/src_files/unit.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../src_file'
+require File.dirname(__FILE__) + '/cpp_file'
+require File.dirname(__FILE__) + '/header_file'
+
+module Ritsu
+  module SrcFiles
+    module AddUnit
+      include AddCppFile
+      include AddHeaderFile
+      
+      def add_unit(name, options={})
+        add_cpp_file(name + ".cpp")
+        add_header_file(name + ".h")
+      end
+      
+      def add_units(*names)
+        paths.each do |path|
+          add_unit(name)
+        end
+      end
+    end
+  end
+end
+
+module Ritsu
+  class Target
+    include Ritsu::SrcFiles::AddUnit
+  end
+  
+  class Project
+    include Ritsu::SrcFiles::AddUnit
+  end
+end

data/lib/ritsu/src_files.rb

@@ -11,4 +11,5 @@ require File.dirname(__FILE__) + '/src_files/executable_cmake_lists'
 require File.dirname(__FILE__) + '/src_files/shared_library_cmake_lists'
 require File.dirname(__FILE__) + '/src_files/static_library_cmake_lists'
 require File.dirname(__FILE__) + '/src_files/project_config_header_file'
-require File.dirname(__FILE__) + '/src_files/project_config_header_template_file'
+require File.dirname(__FILE__) + '/src_files/project_config_header_template_file'
+require File.dirname(__FILE__) + "/src_files/unit"

data/lib/ritsu/target.rb

@@ -38,6 +38,7 @@ module Ritsu
       @src_files = Set.new
       @custom_commands = []
       @topological_order = 0
+      @install = false
       
       Target.instances << self
       @project.targets << self
@@ -48,6 +49,14 @@ module Ritsu
         raise "target with name '#{instance.name}' already exists"
       end
     end
+    
+    def install?
+      @install
+    end
+    
+    def setup_install
+      @install = true
+    end
         
     def src_dir
       self.name
@@ -103,6 +112,12 @@ module Ritsu
       end
     end
     
+    def add_external_libraries(*names)
+      names.each do |name|
+        add_external_library(name)
+      end
+    end
+    
     def add_dependency_target(target_or_target_name)
       if target_or_target_name.kind_of?(String)
         dependency = Target.find_by_name(target_or_target_name)
@@ -115,6 +130,12 @@ module Ritsu
       dependency_targets << dependency
     end
     
+    def add_dependency_targets(*target_or_target_names)
+      target_or_target_names.each do |target|
+        add_dependency_target(target)
+      end
+    end
+    
     def dependency_targets_sorted_by_topological_order
       Target.compute_topological_orders
       result = dependency_targets.to_a

data/lib/ritsu/thors/default_thor.rb

@@ -13,9 +13,9 @@ module Ritsu::Thors
     method_option :generator, :type => :string
     def cmake
       prepare_cmake_generator
-            
-      if !File.exists?(File.dirname(__FILE__) + "/build")
-        FileUtils.mkdir_p(File.dirname(__FILE__) + "/build")
+      
+      if !File.exists?(Ritsu::Project.instance.project_dir + "/build")
+        FileUtils.mkdir_p(Ritsu::Project.instance.project_dir + "/build")
       end
 
       FileUtils.chdir("build", :verbose => true)

data/test/ritsu/src_files/executable_cmake_lists_test.rb

@@ -45,6 +45,47 @@ ADD_EXECUTABLE(abc ${ABC_SRC_FILES})
 
 ##<< TargetCmakeLists -- abc -- Dependencies
 ##>> TargetCmakeLists -- abc -- Dependencies
+
+##<< TargetCmakeLists -- abc -- Install
+##>> TargetCmakeLists -- abc -- Install
+CMAKE
+
+    assert_file_content(expected_content, abc.cmake_lists.abs_path)
+  end
+  
+  file_test "install" do
+    abc = Ritsu::Targets::Executable.new("abc", :project=>@project)
+    abc.setup_install
+    FileRobot.quietly do
+      abc.cmake_lists.create
+    end
+    assert_file_exists(abc.cmake_lists.abs_path)
+
+    expected_content = <<-CMAKE
+##<< TargetCmakeLists -- abc -- Libraries
+##>> TargetCmakeLists -- abc -- Libraries
+
+##<< TargetCmakeLists -- abc -- Custom Commands
+##>> TargetCmakeLists -- abc -- Custom Commands
+
+##<< TargetCmakeLists -- abc -- Source Files
+SET(ABC_SRC_FILES
+)
+##>> TargetCmakeLists -- abc -- Source Files
+
+##<< ExecutableCmakeLists -- abc -- Executable
+ADD_EXECUTABLE(abc ${ABC_SRC_FILES})
+##>> ExecutableCmakeLists -- abc -- Executable
+
+##<< TargetCmakeLists -- abc -- Dependencies
+##>> TargetCmakeLists -- abc -- Dependencies
+
+##<< TargetCmakeLists -- abc -- Install
+INSTALL(TARGETS abc
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+)
+##>> TargetCmakeLists -- abc -- Install
 CMAKE
 
     assert_file_content(expected_content, abc.cmake_lists.abs_path)

data/test/ritsu/src_files/shared_library_cmake_lists_test.rb

@@ -45,6 +45,9 @@ ADD_LIBRARY(abc SHARED ${ABC_SRC_FILES})
 
 ##<< TargetCmakeLists -- abc -- Dependencies
 ##>> TargetCmakeLists -- abc -- Dependencies
+
+##<< TargetCmakeLists -- abc -- Install
+##>> TargetCmakeLists -- abc -- Install
 CMAKE
 
     assert_file_content(expected_content, abc.cmake_lists.abs_path)

data/test/ritsu/src_files/static_library_cmake_lists_test.rb

@@ -45,6 +45,9 @@ ADD_LIBRARY(abc STATIC ${ABC_SRC_FILES})
 
 ##<< TargetCmakeLists -- abc -- Dependencies
 ##>> TargetCmakeLists -- abc -- Dependencies
+
+##<< TargetCmakeLists -- abc -- Install
+##>> TargetCmakeLists -- abc -- Install
 CMAKE
 
     assert_file_content(expected_content, abc.cmake_lists.abs_path)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ritsu
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - dragonmeteor
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 +07:00
+date: 2010-07-19 00:00:00 +07:00
 default_executable: ritsu
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 0
         - 13
@@ -35,9 +38,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -49,9 +54,11 @@ dependencies:
   name: jeweler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -63,9 +70,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -77,9 +86,11 @@ dependencies:
   name: maruku
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 5
@@ -104,6 +115,9 @@ files:
 - bin/ritsu
 - lib/ritsu.rb
 - lib/ritsu/block.rb
+- lib/ritsu/ext/fake_install.rb
+- lib/ritsu/ext/fake_install/project.rb
+- lib/ritsu/ext/fake_install/src_files/project_cmake_lists.rb
 - lib/ritsu/ext/test_case.rb
 - lib/ritsu/external_library.rb
 - lib/ritsu/project.rb
@@ -126,6 +140,7 @@ files:
 - lib/ritsu/src_files/static_library_cmake_lists.rb
 - lib/ritsu/src_files/target_cmake_lists.rb
 - lib/ritsu/src_files/templated_src_file.rb
+- lib/ritsu/src_files/unit.rb
 - lib/ritsu/target.rb
 - lib/ritsu/targets.rb
 - lib/ritsu/targets/executable.rb
@@ -148,6 +163,28 @@ files:
 - lib/ritsu/utility/simple_io.rb
 - lib/ritsu/utility/single_instance.rb
 - lib/ritsu/utility/strings.rb
+- test/ritsu/block_test.rb
+- test/ritsu/external_library_test.rb
+- test/ritsu/project_generators/default_generator_test.rb
+- test/ritsu/project_test.rb
+- test/ritsu/src_file_test.rb
+- test/ritsu/src_files/cpp_file_test.rb
+- test/ritsu/src_files/executable_cmake_lists_test.rb
+- test/ritsu/src_files/header_file_test.rb
+- test/ritsu/src_files/project_cmake_lists_test.rb
+- test/ritsu/src_files/shared_library_cmake_lists_test.rb
+- test/ritsu/src_files/static_library_cmake_lists_test.rb
+- test/ritsu/src_files/target_cmake_lists_test.rb
+- test/ritsu/target_test.rb
+- test/ritsu/targets/executable_test.rb
+- test/ritsu/targets/shared_library_test.rb
+- test/ritsu/targets/static_library_test.rb
+- test/ritsu/template_policies_test.rb
+- test/ritsu/utility/accessors_test.rb
+- test/ritsu/utility/check_upon_add_set_test.rb
+- test/ritsu/utility/file_robot_test.rb
+- test/ritsu/utility/strings_test.rb
+- test/test_helpers.rb
 has_rdoc: true
 homepage: http://github.com/dragonmeteor/ritsu
 licenses: []
@@ -164,23 +201,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ritsu
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A code generation system that facilitates building C/C++ software with the help of CMake and Doxygen