ritsu 0.5.4 → 0.6.0

data/Thorfile

@@ -1,6 +1,15 @@
 # enconding: utf-8
 
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
 require 'thor/rake_compat'
 require 'rake/testtask'
 require 'rake'
@@ -79,13 +88,6 @@ class Default < Thor
       s.files = s.extra_rdoc_files + Dir.glob("{bin,lib}/**/*")
       s.test_files.include 'test/**/*'
       s.test_files.exclude 'test/**/output/**'
-      
-      s.add_runtime_dependency 'thor', '>= 0.13.4'
-      s.add_runtime_dependency 'activesupport', '>= 2.3.5'
-      
-      s.add_development_dependency 'jeweler', '>= 1.4.0'
-      s.add_development_dependency 'yard', '>= 0.5.3'
-      s.add_development_dependency 'maruku', '>= 0.5.9'
     end
 
     Jeweler::GemcutterTasks.new    

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

data/lib/ritsu/ext/cuda/src_files/target_cmake_lists.rb

@@ -100,7 +100,7 @@ module Ritsu
         
         def position_to_insert(block, new_block)
           if new_block.id == cuda_compile_template.id
-              block.child_block_with_id_position(source_files_template.id) + 1
+              block.child_block_with_id_position(source_files_template.id) + 2
           else
             position_to_insert_before_cuda(block, new_block)
           end

data/lib/ritsu/ext/qt/src_files/header_file.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../src_files/header_file")
+
+module Ritsu
+  module SrcFiles
+    class HeaderFile
+      alias_method :initialize_target_before_qt, :initialize
+      
+      def initialize(src_path, owner, options={})
+        options = {:qt_header_file => false}.merge(options)
+        initialize_target_before_qt(src_path, owner)
+        @qt_header_file = options[:qt_header_file] 
+      end
+      
+      def qt_header_file?
+        @qt_header_file
+      end
+    end
+    
+    module AddQtHeaderFile
+      def add_qt_header_file(path, options={})
+        src_path = compute_src_path(path, options)
+        HeaderFile.new(src_path, self, :qt_header_file=>true)
+      end
+      
+      def add_qt_header_files(*paths)
+        paths.each do |path|
+          add_qt_header_file(path)
+        end
+      end
+    end
+    
+    module AddQtUnit
+      include AddCppFile
+      include AddQtHeaderFile
+      
+      def add_qt_unit(name, options={})
+        add_cpp_file(name + ".cpp")
+        add_qt_header_file(name + ".h")
+      end
+      
+      def add_qt_units(*names)
+        names.each do |name|
+          add_qt_unit(name)
+        end
+      end
+    end
+  end
+end
+
+module Ritsu
+  class Target
+    include Ritsu::SrcFiles::AddQtHeaderFile
+    include Ritsu::SrcFiles::AddQtUnit
+  end
+  
+  class Project
+    include Ritsu::SrcFiles::AddQtHeaderFile
+    include Ritsu::SrcFiles::AddQtUnit
+  end
+end

data/lib/ritsu/ext/qt/src_files/target_cmake_lists.rb

@@ -53,7 +53,7 @@ module Ritsu
         def update_block(block, options = {})
           block.clear_contents
           
-          header_files = target.src_files.select { |x| x.respond_to?(:header_file?) && x.header_file? }
+          header_files = target.src_files.select { |x| x.respond_to?(:qt_header_file?) && x.qt_header_file? }
           if header_files.length == 0
             return
           end
@@ -94,9 +94,9 @@ module Ritsu
         
         def position_to_insert(block, new_block)
           if new_block.id == qt_moc_template.id
-            block.child_block_with_id_position(qt_ui_template.id) + 1
+            block.child_block_with_id_position(qt_ui_template.id) + 2
           elsif new_block.id == qt_ui_template.id
-            block.child_block_with_id_position(source_files_template.id) + 1
+            block.child_block_with_id_position(source_files_template.id) + 2
           else
             position_to_insert_before_cuda(block, new_block)
           end

data/lib/ritsu/ext/qt.rb

@@ -1,3 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + "/qt/project")
 require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/target_cmake_lists")
 require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/ui_file")
+require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/header_file")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ritsu
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - dragonmeteor
@@ -19,8 +19,6 @@ date: 2010-12-03 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +31,10 @@ dependencies:
         - 4
         version: 0.13.4
   type: :runtime
+  name: thor
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +47,25 @@ dependencies:
         - 5
         version: 2.3.5
   type: :runtime
+  name: activesupport
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: i18n
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +77,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
+  name: jeweler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +93,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: maruku
+  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +109,9 @@ dependencies:
         - 9
         version: 0.5.9
   type: :development
-  version_requirements: *id005
+  name: maruku
+  prerelease: false
+  version_requirements: *id006
 description: Ritsu is a tool to help generate CMakeLists.txt and other source code files in a C++ software project.
 email: dragonmeteor@gmail.com
 executables: 
@@ -132,6 +146,7 @@ files:
 - lib/ritsu/ext/glsl/src_files/vert_file.rb
 - lib/ritsu/ext/qt.rb
 - lib/ritsu/ext/qt/project.rb
+- lib/ritsu/ext/qt/src_files/header_file.rb
 - lib/ritsu/ext/qt/src_files/target_cmake_lists.rb
 - lib/ritsu/ext/qt/src_files/ui_file.rb
 - lib/ritsu/ext/test_case.rb
@@ -206,7 +221,6 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
 - --title
 - Ritsu
 - --main