build-tool 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.5.2
+- Bugfix
+  - Be less verbose about adding ssh-key to the agent. One time is enough.
+  - If a environment variable is empty in the recipe remove it from the environment instead of
+    setting it to "".
+  - Bring back the archive build-system. It was temporarily unavailable since 0.5.0
+
 == 0.5.1
 - Bugfix
   - Add missing files.

data/lib/build-tool.rb

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

data/lib/build-tool/cfg/lexer.rex

@@ -79,6 +79,9 @@ rule
     ### ARCHIVE
     #
     :ARCHIVE end\b    { @state = @states.pop; [ :END, text ]; }
+    :ARCHIVE repository\b   { @states.push @state; @state = :REPOSITORY;   [:REPOSITORY,   text]; }
+    :ARCHIVE remote-path\b  { [:REMOTE_PATH,    text]; }
+    :ARCHIVE use\b          { @states.push @state; @state = :USE;     [:USE,     text]; }
     # COMMON
     :ARCHIVE {STRING}      { [:STRING,  @ss[1]]; }
     :ARCHIVE {TOKEN}       { [:TOKEN,   text];   }

data/lib/build-tool/cfg/node.rb

@@ -76,7 +76,7 @@ def initialize(values = nil)
 
         SvnDeclaration
         SvnCheckoutOnly
-        SvnRemotePath
+        RemotePath
 
         UseBuildSystem
         UseEnvironment

data/lib/build-tool/cfg/parser.y

@@ -116,11 +116,14 @@ rule
 
     archive_statements
         : /* empty */
-        # | archive_statement archive_statements { result = val.flatten; }
+        | archive_statement archive_statements { result = val.flatten; }
         ;
 
-    # archive_statement
-        # ;
+    archive_statement
+        : USE REPOSITORY   identifier { result = UseRepositoryNode.new( val[2] ); }
+        | REMOTE_PATH STRING          { result = RemotePathNode.new(    val[1] ); }
+        | repository_declaration      { result = val[0]; }
+        ;
 
     #
     ### BUILD SYSTEM DECLARATION
@@ -226,7 +229,7 @@ rule
         : git_statement                 { result = val[0]; }
         | USE REPOSITORY identifier     { result = UseRepositoryNode.new( val[2] ); }
         | EXTERNAL STRING               { result = GitSvnExternalNode.new( val[1] ); }
-        | REMOTE_PATH STRING            { result = SvnRemotePathNode.new( val[1] ); }
+        | REMOTE_PATH STRING            { result = RemotePathNode.new( val[1] ); }
         | repository_declaration        { result = val[0]; }
         ;
 
@@ -338,7 +341,7 @@ rule
     svn_statement
         : ONLY STRING { result = SvnCheckoutOnlyNode.new(val[1]); }
         | USE REPOSITORY   identifier { result = UseRepositoryNode.new( val[2] ); }
-        | REMOTE_PATH STRING          { result = SvnRemotePathNode.new(    val[1] ); }
+        | REMOTE_PATH STRING          { result = RemotePathNode.new(    val[1] ); }
         | repository_declaration      { result = val[0]; }
         ;
 

data/lib/build-tool/cfg/visitor.rb

@@ -191,6 +191,24 @@ def visit_ArchiveDeclarationNode( node )
             return @vcs
         end
 
+        def visit_RepositoryDeclarationNode( node )
+            visitor = RepositoryDeclarationNodeVisitor.new( configuration )
+            @vcs.repository = node.accept( visitor )
+        end
+
+        def visit_UseRepositoryNode( node )
+            repo = configuration.repository( node.value )
+            if repo.nil?
+                raise ConfigurationError, "Unknown repository #{node.value}!"
+            end
+            @vcs.repository = repo
+        end
+
+        def visit_RemotePathNode( node )
+            @vcs.remote_path = node.value
+        end
+
+
     end # class ArchiveDeclarationNodeVisitor
 
 
@@ -399,7 +417,7 @@ def visit_UseRepositoryNode( node )
             @vcs.repository = repo
         end
 
-        def visit_SvnRemotePathNode( node )
+        def visit_RemotePathNode( node )
             @vcs.remote_path = node.value
         end
 
@@ -734,7 +752,7 @@ def visit_UseRepositoryNode( node )
             @vcs.repository = repo
         end
 
-        def visit_SvnRemotePathNode( node )
+        def visit_RemotePathNode( node )
             @vcs.remote_path = node.value
         end
 

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

@@ -55,6 +55,7 @@ def do_execute_module( mod )
                 when 'svn'
                     say "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ]
                 when 'archive'
+                    say "  URL:              %s" % [ mod.vcs.archive_url ]
                 when 'git'
                     mod.vcs_configuration.remote.each do |key, val|
                         if val.push_url

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

@@ -12,6 +12,12 @@ def name
             "archive"
         end
 
+        def initialize
+            super
+            @repository = nil
+            @remote_path = nil
+        end
+
         def vcs( mod )
             raise StandardError if @module and ! mod.equal?( @module )
             @module = mod
@@ -22,6 +28,22 @@ def copy_configuration( other )
             super
         end
 
+        attr_writer :repository
+        def repository
+            if @repository.nil?
+                 raise ConfigurationError, "No repository configured for module #{mod.name}."
+            end
+            @repository
+        end
+
+        attr_writer :remote_path
+        def remote_path
+            if @remote_path.nil?
+                return @module.name
+            end
+            @remote_path
+        end
+
     end # class ArchiveConfiguration
 
     class Archive < Base
@@ -57,7 +79,7 @@ def archive_name
         end
 
         def archive_url
-            "#{repository.url}/#{remote_path}"
+            "#{config.repository.url}/#{config.remote_path}"
         end
 
         #
@@ -168,6 +190,17 @@ def rebase
             0
         end
 
+        def prepare_for_access
+            # If our server has an associated ssh-key, add it to the ssh-agent.
+            if config.repository.sshkey
+                key = config.repository.sshkey
+                logger.info ""
+                logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
+                MJ::Tools::SSH::add_key key.file
+            end
+            true
+        end
+
     end # class Archive
 
 end; end

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

@@ -146,9 +146,11 @@ def prepare_for_access
             # If our server has an associated ssh-key, add it to the ssh-agent.
             if config.repository.sshkey
                 key = config.repository.sshkey
-                logger.info ""
-                logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
-                MJ::Tools::SSH::add_key key.file
+                if ! MJ::Tools::SSH::has_key? key.file
+                    logger.info ""
+                    logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
+                    MJ::Tools::SSH::add_key key.file
+                end
             end
             true
         end

data/lib/mj/tools/subprocess.rb

@@ -63,8 +63,14 @@ def adjust_environment( wd=nil, env=nil, lang="C" )
                 if env
                     env.each do |var, value|
                         oldenv[var] = ENV[var]
-                        logger.verbose  "#{var} = #{value}"
-                        ENV[var] = value
+                        if value.nil? or value == ""
+                            next if ENV.has_key?( value )
+                            ENV[var] = nil
+                            logger.verbose  "Removing #{var} from environment"
+                        else
+                            logger.verbose  "#{var} = #{value}"
+                            ENV[var] = value
+                        end
                     end
                 end
                 # Save old LANG setting and switch to 'C'

metadata

@@ -2,7 +2,7 @@
 name: build-tool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Michael Jansen
@@ -31,7 +31,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,7 +152,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.0
+        version: 2.9.1
   type: :development
   version_requirements: *id011
 description: |-

metadata.gz.sig

@@ -1,3 +1 @@
-��h?C&��e�/��&3�ѱWj����两����6�S'v[.���+m�n䉗pt8�>�c�B�| l��[6��Ul7I|��L?��xr�n���dc]��md
-�H��^�7kc����(4ob$0A�8	0i@���TL�����
-��7�|DR/7뽴X~
+��zі����V*�����T�s��w�q��!��	��P:����4�-Fl;'�u7Zo�	ڎ#iCx)!b�!KN�Y)����ɍ���`2�ȱ���N�_��(A�N�9����@ d&+Z����s	�T�K�s�E2���Qy$�O���>�`�!�W�BIِ/�I�0��Q��KW����bx�{��y��@�k&s钟2����49��Q_b�4#�.˴˴�%Aed�DQ��t]��Ul�