build-tool 0.5.3 → 0.5.4

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

@@ -31,9 +31,7 @@ def do_execute( args )
             say "Browse Repository: #{rec.browse_repository}" if rec.browse_repository
             if rec.long_description
                 say "Long Description:"
-                for line in rec.long_description
-                    say "  #{line.chomp}"
-                end
+                    say rec.long_description
                 say ""
             end
 

data/lib/build-tool/module.rb

@@ -313,17 +313,32 @@ def cleanup_after_vcs_access
         end
 
         # Check if an ssh-key is required and active it if necessary
-        def prepare_for_vcs_access
+        def prepare_for_fetch
             if vcs
-                return vcs.prepare_for_access
+                return vcs.prepare_for_fetch
             end
             true
         end
 
         # Check if an ssh-key is required and active it if necessary
-        def ready_for_vcs_access
+        def prepare_for_rebase
             if vcs
-                return vcs.ready_for_access
+                return vcs.prepare_for_rebase
+            end
+            true
+        end
+
+        # Check if an ssh-key is required and active it if necessary
+        def ready_for_fetch
+            if vcs
+                return vcs.ready_for_fetch
+            end
+            true
+        end
+
+        def ready_for_rebase
+            if vcs
+                return vcs.ready_for_rebase
             end
             true
         end

data/lib/build-tool/recipe.rb

@@ -132,6 +132,7 @@ def files_path
             return @global_path.join('files')
         end
 
+
         def website
             return @website if @metainfo_loaded
             load_metainfo
@@ -154,11 +155,12 @@ def self.all_recipes
                 # Skip directories that don't exist
                 next if !dir.exist?
                 Dir.foreach( dir ) { |name|
+                    next if recipes.has_key?(name)
                     next if name == '..'
                     next if name == '.'
                     pn = Pathname.new(dir).join(name)
                     next if !pn.directory?
-                    next if recipes.has_key?(name)
+                    next if !valid?( pn )
                     recipes[name] = Recipe.new(name)
                 }
             end
@@ -173,11 +175,22 @@ def self.all_recipes
         def self.find_recipe( name )
             self.config_directories.each do |dir|
                 recipe = dir.join( name )
-                return recipe if recipe.join('recipe').exist?
+                return recipe if valid?( recipe )
             end
             raise ConfigurationError, "Recipe #{name} not found!";
         end
 
+        # Checks if the directory containts a valid recipe. It is valid if:
+        # - All expected file exists
+        #   - recipe-local
+        #   - info.yaml
+        #   - recipe
+        def self.valid?( directory )
+            return directory.join( 'recipe-local' ).exist? &&
+                   directory.join( 'recipe').exist? &&
+                   directory.join( 'info.yaml' ).exist? &&
+                   directory.join( 'settings.yaml' ).exist?
+        end
 
     end # class Recipe
 

data/lib/build-tool/vcs/archive.rb

@@ -190,7 +190,7 @@ def rebase
             0
         end
 
-        def prepare_for_access
+        def prepare_for_fetch
             # If our server has an associated ssh-key, add it to the ssh-agent.
             return check_for_sshkey( config.repository.sshkey )
         end

data/lib/build-tool/vcs/base.rb

@@ -83,11 +83,19 @@ def configure
             logger.debug "VCS #{name} did not implement configure!"
         end
 
-        def prepare_for_access
+        def prepare_for_fetch
             true
         end
 
-        def ready_for_access
+        def prepare_for_rebase
+            true
+        end
+
+        def ready_for_fetch
+            true
+        end
+
+        def ready_for_rebase
             true
         end
 

data/lib/build-tool/vcs/git-svn.rb

@@ -138,7 +138,7 @@ def git_svn( command, wd = local_path, &block )
             self.class.execute( "git svn " + command, wd, &block )
         end
 
-        def prepare_for_access
+        def prepare_for_fetch
             # If our server has an associated ssh-key, add it to the ssh-agent.
             return check_for_sshkey( config.repository.sshkey )
         end
@@ -149,6 +149,14 @@ def rebase
             end
         end
 
+        def ready_for_fetch
+            git.ready_for_fetch
+        end
+
+        def ready_for_rebase
+            git.ready_for_rebase
+        end
+
         def remote_path
             @config.remote_path
         end

data/lib/build-tool/vcs/git.rb

@@ -229,7 +229,7 @@ def git( command, wd = local_path, &block )
             self.class.execute "git #{command}", wd, &block
         end
 
-        def prepare_for_access
+        def prepare_for_fetch
             # If our server has an associated ssh-key, add it to the ssh-agent.
             return check_for_sshkey( config.remote[ config.track_remote ].server.sshkey )
         end
@@ -252,6 +252,20 @@ def ready_for_access
                     end
                 end
 
+                # Check if there is a commit template. If yes add it.
+                if ( not gitconfig["commit.template"] ) && Pathname.new( local_path ).join( '.commit-template' ).exist?
+                    logger.info "#{config.module.name}: git-config: Setting commit.template to .commit-template"
+                    gitconfig["commit.template"] = ".commit-template"
+                end
+
+            end
+        end
+
+        # Check if the module is ready for a rebase.
+        def ready_for_rebase
+
+            if checkedout?
+
                 # Check if the index is dirty.
                 if git( "diff --exit-code" ) != 0
                     logger.info( "#{config.module.name}: A dirty index will prevent the rebase." )
@@ -268,15 +282,13 @@ def ready_for_access
                     end
                     return false
                 end
-
             end
-
             true
         end
 
         def rebase
             if 0 != ( git "rebase #{config.track_remote}/#{config.track_branch}" )
-                raise GitSvnError, "Error while rebasing the repo with `#{config.track_remote}/#{config.track_branch}': #{$?}"
+                raise GitError, "Error while rebasing the repo with `#{config.track_remote}/#{config.track_branch}': #{$?}"
             end
         end
 

data/lib/build-tool/vcs/svn.rb

@@ -35,7 +35,7 @@ def copy_configuration( other )
         attr_writer :repository
         def repository
             if @repository.nil?
-                 raise ConfigurationError, "No repository configured for module #{mod.name}."
+                 raise ConfigurationError, "No repository configured for module #{@module.name}."
             end
             @repository
         end
@@ -131,7 +131,7 @@ def last_changed_rev
             return version
         end
 
-        def prepare_for_access
+        def prepare_for_fetch
             # If our server has an associated ssh-key, add it to the ssh-agent.
             return check_for_sshkey( config.repository.sshkey )
         end

data/lib/mj/logging.rb

@@ -38,6 +38,9 @@ def format( event )
     end # class BasicLayout
 
 
+
+
+
     # :TODO: Map the Logging Levels to Logger Levels instead of hardcoding them here.
     class LoggerAdapter
 
@@ -90,4 +93,35 @@ def unknown( string )
         end
     end
 
+
+
+    class Progressbar < ::Logging::Appender
+
+        def initialize( title, total = 100, &block )
+            super( 'Progressbar', :level => :DEBUG )
+            @pbar = nil
+            @oldlogger = nil
+            if ::Logging.appenders['stdout'].level >= ::Logging::level_num(:INFO)
+                # We only do the progressbar thing if there is no verbose output active.
+                begin
+                    # Remove the old stdout logger.
+                    @oldlogger = ::Logging.appenders[ 'stdout' ]
+                    ::Logging.logger[ 'root' ].remove_appenders( 'stdout' )
+                    ::Logging.logger[ 'root' ].add_appenders( self )
+                    # Add the progressbar logger
+                    @pbar = ANSI::Progressbar.new( title, total )
+                    yield
+                ensure
+                    @pbar.finish unless @pbar.nil?
+                    # Reset the logger
+                    ::Logging.logger[ 'root' ].remove_appenders( 'Progressbar' )
+                    ::Logging.logger[ 'root' ].add_appenders( @oldlogger )
+                end
+            else
+                # If there is verbose output just print the text
+                logger.info( title )
+                yield
+            end
+        end
+    end # class Progressbar
 end; end

metadata

@@ -1,195 +1,165 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: build-tool
-version: !ruby/object:Gem::Version
-  version: 0.5.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.5.4
 platform: ruby
-authors:
+authors: 
 - Michael Jansen
 autorequire: 
 bindir: bin
-cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
+cert_chain: []
 
-  MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBDMQwwCgYDVQQDDANrZGUx
-
-  HjAcBgoJkiaJk/IsZAEZFg5taWNoYWVsLWphbnNlbjETMBEGCgmSJomT8ixkARkW
-
-  A2JpejAeFw0wOTA2MDkyMDI1MThaFw0xMDA2MDkyMDI1MThaMEMxDDAKBgNVBAMM
-
-  A2tkZTEeMBwGCgmSJomT8ixkARkWDm1pY2hhZWwtamFuc2VuMRMwEQYKCZImiZPy
-
-  LGQBGRYDYml6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurxaZL3l
-
-  DVi5wG2HKTLVjl9Wl9gJT5L8edAxHrNMQtT3WQlyo3QNhOgLfVP9zMg49Y8dBRAP
-
-  w9ez71UJfjI17+KEEI6rdMF+poljfpszboRNqkuhn8b+kPy9vyVz93lIhyCUi4dx
-
-  Nyc2BSGjoYqQkVNZymz4TTb2xoMjUWkCjBsr8sxjB74zFaYqzjNMhWZUZB4CH1J1
-
-  S2+rdybmeC3/Yt3ck9kPgUQNRL5pnH9eJrFYzocbFHjp28CJf0zNmn8aUS1R32hD
-
-  5optxe9j6Jh0sXW2Qqw3swfVwaJIrDI4KNcWlJTAO++FHsV8Jh9Y1HMUgcSVpWVj
-
-  2SdR6e6L30jpNwIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-
-  HQ4EFgQU5L+10wMUoKc2MaHICpfSJ+HCffgwDQYJKoZIhvcNAQEFBQADggEBABWy
-
-  Uio+50gcBdYsmWRVcS2W3BLGes7KwD9CAcVZGa7adH8EY+ZrPkbhB2Csk/UZnuo5
-
-  2THemT8qy42gxgI1RRv9+PFDCXA+p2URzlhXhsO4JHdNeaGEwsOETx29xRO1QTnl
-
-  bOjSlG4mdCB9WMAD2w58JAefhObPKQMl2L8sc0S3pEIcFmbLAVT4W6AbUiiK9C4T
-
-  AjmSlxUk0RdTT1xL0QQ88HoNxLK8hJHAT8pNq36taixh0ORmmqocRvIL0YrHUPa3
-
-  bdM0RIoUSO1SXrHpXDdvfp9w4BsMZiAf87eeq974P8VuyKbHgxN9El1nwtFGEfwm
-
-  M3zOaQdtTmiQPBqNIsE=
-
-  -----END CERTIFICATE-----
-
-'
-date: 2011-02-26 00:00:00.000000000 +01:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2011-08-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: logging
-  requirement: &7397600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.3
   type: :runtime
-  prerelease: false
-  version_requirements: *7397600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: sequel
-  requirement: &7396920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.18.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  version_requirements: *7396920
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &7396260 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
   type: :runtime
-  prerelease: false
-  version_requirements: *7396260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: ansi
-  requirement: &7395560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.2.2
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: grit
   prerelease: false
-  version_requirements: *7395560
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.1
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: racc
-  requirement: &7394880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.4.7
   type: :development
-  prerelease: false
-  version_requirements: *7394880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: hoe-debugging
-  requirement: &7394240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.1
   type: :development
-  prerelease: false
-  version_requirements: *7394240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: hoe-doofus
-  requirement: &7393780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *7393780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: hoe-git
-  requirement: &7393320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  prerelease: false
-  version_requirements: *7393320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: racc
-  requirement: &7384980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.6
   type: :development
-  prerelease: false
-  version_requirements: *7384980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: rexical
-  requirement: &7384540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.5
   type: :development
-  prerelease: false
-  version_requirements: *7384540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &7384020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.1
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.9"
   type: :development
-  prerelease: false
-  version_requirements: *7384020
-description: ! 'This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].
-
-
+  version_requirements: *id012
+description: |-
+  This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].
+  
   It help in building and maintaining a development environment. It downloads
-
-  and configures sources and updates them later.'
-email:
+  and configures sources and updates them later.
+email: 
 - info@michael-jansen.biz
-executables:
+executables: 
 - build-tool
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.txt
-files:
+files: 
 - .gitattributes
 - .gitignore
 - History.txt
@@ -270,66 +240,33 @@ files:
 - lib/mj/tools/subprocess.rb
 - lib/mj/vcs/git.rb
 - lib/mj/visitor.rb
-- tasks/rspec.rake
-- test/commands/test_build.rb
-- test/test_build_system.rb
-- test/test_cli.rb
-- test/test_command.rb
-- test/test_configuration_parser.rb
-- test/test_environment.rb
-- test/test_feature.rb
-- test/test_helper.rb
-- test/test_history.rb
-- test/test_module.rb
-- test/test_repository.rb
-- test/test_singleton.rb
-- test/test_ssh_key.rb
-- test/test_svn_parser.rb
-- test/test_vcs.rb
-- .gemtest
-has_rdoc: true
 homepage: http://michael-jansen.biz/build-tool
 licenses: []
-post_install_message: ! "    To start with build-tool try the following commands:\n
-  \   > build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git
-  kde\n    > build-tool recipe list\n    > build-tool recipe install kde\n\n    For
-  documentation see http://michael-jansen.biz/build-tool\n\n"
-rdoc_options:
+
+post_install_message: "    To start with build-tool try the following commands:\n    > build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git kde\n    > build-tool recipe list\n    > build-tool recipe install kde\n\n    For documentation see http://michael-jansen.biz/build-tool\n\n"
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: build-tool
-rubygems_version: 1.5.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/]
-test_files:
-- test/test_environment.rb
-- test/test_helper.rb
-- test/test_svn_parser.rb
-- test/test_vcs.rb
-- test/test_repository.rb
-- test/test_singleton.rb
-- test/test_command.rb
-- test/test_ssh_key.rb
-- test/commands/test_build.rb
-- test/test_cli.rb
-- test/test_module.rb
-- test/test_history.rb
-- test/test_build_system.rb
-- test/test_configuration_parser.rb
-- test/test_feature.rb
+test_files: []
+