build-tool 0.4.2 → 0.4.3

data.tar.gz.sig

@@ -1 +1,2 @@
-���{t6�q�g�]O06�Z؞c�z�x	?�X�"S	_0&6�����i��L
�����s�g!�(�r~�u-1��_��8I%��E?R�m�l��-�U���zg�)���K��_G���]���J�?�5~!57�k���eN��`�h�.�npm���d�-(zx��V����}��ܕ�����v�3o>)e?$��x�2clsw����eQ��B&�/�,������K��/�$�{&��8�ɓw
+Q#^F��Ox�����C<�7���j�1|(%r��f�Re#���7�����"��eQ]��m)�G�߼9���	/$�rEl<|�|j�����
ǯ�t��^߀���A!>�4N>ss���?�^�h��+��x�+M/Xv���
+���g �	�A���t����d;���\�?�d�,�Q�V����=�|֟T��p��MA���i��h�+�F��$H;��N)��5%�D��Hr?���������YMd��ׄnDt�

data/History.txt

@@ -1,3 +1,6 @@
+== 0.4.3
+- Ruby 1.9 Compatibility.
+
 == 0.4.2
 - Enhancements
   - Usability: When working on many modules show (current number/total number) of modules for information.

data/Manifest.txt

@@ -5,7 +5,6 @@ Manifest.txt
 README.txt
 Rakefile
 bin/build-tool
-bin/build-tool-1.9
 db/migrations/001_command_histories.rb
 db/migrations/002_module_events.rb
 db/migrations/003_command_histories_add_logfile.rb

data/Rakefile

@@ -10,9 +10,13 @@ Hoe.plugin :debugging
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-Hoe.spec( 'build-tool' ) do |build_tool|
-  build_tool.developer 'Michael Jansen', 'info@michael-jansen.biz'
-  build_tool.post_install_message = <<-EOS
+Hoe.spec( 'build-tool' ) do
+
+  self.developer 'Michael Jansen', 'info@michael-jansen.biz'
+
+  self.version = BuildTool::VERSION
+
+  self.post_install_message = <<-EOS
     To start with build-tool try the following commands:
     > build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git kde
     > build-tool recipe list
@@ -21,22 +25,20 @@ Hoe.spec( 'build-tool' ) do |build_tool|
     For documentation see http://michael-jansen.biz/build-tool
 
   EOS
-  build_tool.rubyforge_name       = build_tool.name
+  self.rubyforge_name = self.name
 
-  build_tool.extra_deps           = [
-    ['logging', ">= 1.4.3"],
-    ['sequel', ">= 3.18.0"],
-    ['sqlite3-ruby', ">= 1.3.1" ],
+  self.extra_deps <<
+    ['logging', ">= 1.4.3"] <<
+    ['sequel', ">= 3.18.0"] <<
+    ['sqlite3-ruby', ">= 1.3.1" ] <<
     ['ansi', '>= 1.2.2' ]
-  ]
 
-  build_tool.extra_dev_deps           = [
-    ['hoe-debugging', ">= 1.0.1"],
-    ['hoe-doofus', ">= 1.0.0"],
-    ['hoe-git', ">= 1.3.0"],
-    ['racc', ">= 1.4.6"],
+  self.extra_dev_deps <<
+    ['hoe-debugging', ">= 1.0.1"] <<
+    ['hoe-doofus', ">= 1.0.0"] <<
+    ['hoe-git', ">= 1.3.0"] <<
+    ['racc', ">= 1.4.6"] <<
     ['rexical', ">= 1.0.5"]
-  ]
 
 end
 

data/bin/build-tool

@@ -7,15 +7,9 @@ require 'pathname'
 require 'rubygems'
 
 # libs relative to the link target
-if File.symlink?(__FILE__)
-    root_directory = File.dirname(File.readlink(__FILE__))
-else
-    root_directory = File.dirname(__FILE__)
-end
-
-root_directory = Pathname.new( root_directory ).join( '..' )
-require File.expand_path( root_directory + "lib/build-tool")
+root_directory = Pathname.new(__FILE__).realpath.dirname.dirname
 
+require root_directory.join( 'lib/build-tool')
 require 'build-tool/application'
 
 exit BuildTool.main( $0, ARGV, root_directory );

data/lib/build-tool.rb

@@ -2,6 +2,6 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BuildTool
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end
 

data/lib/build-tool/application.rb

@@ -122,6 +122,10 @@ def main( args )
             end
         end
 
+        def has_recipe?
+            not BuildTool::Application.instance.name.start_with? "build-tool"
+        end
+
     end # class Application
 
 end # module BuildTool

data/lib/build-tool/command_actions.rb

@@ -1,6 +1,6 @@
 require 'ansi'
 require 'logging'
-require 'ftools'
+require 'fileutils'
 
 module BuildTool
 

data/lib/build-tool/commands.rb

@@ -767,7 +767,7 @@ def load_commands( path, parentmod, submod = nil )
                 # Get the obj
                 obj = parentmod.const_get( objname )
                 # :TODO: Better solution
-                next if [ "Standard", "ModuleBasedCommand", "Base", "SubCommands", "Shell" ].include? objname
+                next if [ "Standard", "ModuleBasedCommand", "Base", "SubCommands", "Shell" ].include? objname.to_s
                 next if ! obj.kind_of? Class
 
                 tmp = obj

data/lib/build-tool/commands/build.rb

@@ -58,7 +58,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def is_module_ready?( mod )

data/lib/build-tool/commands/configure.rb

@@ -46,7 +46,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def is_module_ready?( mod )

data/lib/build-tool/commands/ctags.rb

@@ -21,7 +21,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute_module( mod )

data/lib/build-tool/commands/environments.rb

@@ -12,7 +12,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute

data/lib/build-tool/commands/fetch.rb

@@ -23,7 +23,7 @@ def log?
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def initialize_options

data/lib/build-tool/commands/files.rb

@@ -14,7 +14,7 @@ class Files < Standard
                            "or the content of the given file if one is specified." ]
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute( args )

data/lib/build-tool/commands/gc.rb

@@ -19,13 +19,13 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute( args )
             case args.length
 
-            when 0:
+            when 0
                 # Nothing
                 #
             else

data/lib/build-tool/commands/history.rb

@@ -39,18 +39,18 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute( args )
             case args.length
 
-            when 0:
+            when 0
                 return show_command_history
-            when 1:
+            when 1
                 return show_detailed_command_history( args[0] ) if args[0] =~ /^[0-9]+/
                 case args[0][0,1]
-                when '+':
+                when '+'
                     return show_detailed_command_history( args[0] )
                 else
                     return show_module_history( args[0] )

data/lib/build-tool/commands/info.rb

@@ -17,7 +17,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute( args )

data/lib/build-tool/commands/install.rb

@@ -33,7 +33,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def is_module_ready?( mod )

data/lib/build-tool/commands/lsfeatures.rb

@@ -18,7 +18,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute( args )

data/lib/build-tool/commands/modules.rb

@@ -12,7 +12,7 @@ def initialize_options
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def do_execute

data/lib/build-tool/commands/rebase.rb

@@ -21,7 +21,7 @@ def log?
         end
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def initialize_options

data/lib/build-tool/commands/recipes/incoming.rb

@@ -13,7 +13,7 @@ class Incoming < Standard
         description "Show the incoming changes to the recipe from the repository."
 
         def applicable?
-            BuildTool::Application.instance.name != "build-tool"
+            BuildTool::Application.instance.has_recipe?
         end
 
         def initialize_options

data/lib/build-tool/commands/recipes/info.rb

@@ -1,7 +1,7 @@
 require 'build-tool/commands'
 require 'build-tool/recipe'
 
-require 'ftools'
+require 'fileutils'
 
 module BuildTool; module Commands; module Recipes
 

data/lib/build-tool/commands/recipes/install.rb

@@ -1,6 +1,6 @@
 require 'build-tool/application'
 require 'build-tool/commands'
-require 'ftools'
+require 'fileutils'
 
 module BuildTool; module Commands; module Recipes
 
@@ -40,7 +40,7 @@ def do_execute(args)
             conffile = Application::instance.local_configuration_dir.join("#{commandname}.yaml")
 
             # Our executable
-            buildtool = Application::instance.application_root.join( 'bin', 'build-tool' ).to_s
+            buildtool = Application::instance.application_root.join( 'bin', $0 ).to_s
 
             # Load the recipe
             recipe = Recipe.find_recipe(recipename)
@@ -138,7 +138,7 @@ def do_execute(args)
                 logger.error( "Local configuration for #{commandname} already exists." )
             else
                 FileUtils.mkdir_p( Application::instance.local_configuration_dir.join( commandname ) )
-                File.copy(recipe.join("recipe-local"),
+                FileUtils.cp(recipe.join("recipe-local"),
                           Application::instance.local_configuration_dir.join( commandname, 'recipe' ))
             end
 

data/tasks/rspec.rake

@@ -1,11 +1,11 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'spec'
+  require 'rspec'
 end
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 rescue LoadError
   puts <<-EOS
 To use rspec for testing you must install rspec gem:
@@ -15,7 +15,8 @@ EOS
 end
 
 desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ['--options', "spec/spec.opts"]
+  # :TODO: Port me
+  # t.spec_files = FileList['spec/**/*_spec.rb']
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Michael Jansen
@@ -36,7 +36,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2011-01-02 00:00:00 +01:00
+date: 2011-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -208,7 +208,6 @@ email:
 - info@michael-jansen.biz
 executables: 
 - build-tool
-- build-tool-1.9
 extensions: []
 
 extra_rdoc_files: 
@@ -223,7 +222,6 @@ files:
 - README.txt
 - Rakefile
 - bin/build-tool
-- bin/build-tool-1.9
 - db/migrations/001_command_histories.rb
 - db/migrations/002_module_events.rb
 - db/migrations/003_command_histories_add_logfile.rb
@@ -343,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: build-tool
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/]

data/bin/build-tool-1.9

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby1.9
-#
-#  Created by Michael Jansen on 2009-8-31.
-#  Copyright (c) 2009. All rights reserved.
-
-require 'pathname'
-require 'rubygems'
-
-# libs relative to the link target
-if File.symlink?(__FILE__)
-    root_directory = File.dirname(File.readlink(__FILE__))
-else
-    root_directory = File.dirname(__FILE__)
-end
-
-root_directory = Pathname.new( root_directory ).join( '..' )
-require File.expand_path( root_directory + "lib/build-tool")
-
-require 'build-tool/application'
-
-exit BuildTool.main( $0, ARGV, root_directory );