build-tool 0.3.2 → 0.3.3

data/.gitattributes

@@ -0,0 +1,3 @@
+# Use the ruby diff command for ruby files
+# > git config --global diff.ruby.funcname '^ *\(\(class\|module\|def\) .*\)'
+*.rb diff=ruby

data/.gitignore

@@ -0,0 +1,8 @@
+test.yaml
+doc/*
+tags
+config/website.yml
+pkg/*
+*~
+*.sw[p-z]
+.yardoc

data/History.txt

@@ -1,3 +1,14 @@
+== 0.3.3
+- Feature
+  - The history command now supports the -n --number [COUNT] option. Use it to specify how many
+    entries you want to see.
+- Bugfixes
+  - Fix the gc command. Sqlite really starts to enforce foreign key constraints.
+  - Support arbitrary build options for autoconf
+  - Do not reassociate a module / environment with a different feature when just changing it. The
+    initial associtation is correct.
+
+
 == 0.3.2
 - Main Features
   - none

data/Manifest.txt

@@ -1,3 +1,5 @@
+.gitattributes
+.gitignore
 History.txt
 Manifest.txt
 README.txt

data/lib/build-tool.rb

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

data/lib/build-tool/build-system/autoconf.rb

@@ -31,10 +31,14 @@ def configured?
         #
 
         def[]( var )
+            if @options.has_key? var
+                return @options[var]
+            end
+
             case var
 
-            when 'CXXFLAGS'
-                return @options[var]
+            when 'libdir'
+                return ""
 
             else
                 # *TODO* raise correct exception

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

@@ -197,11 +197,14 @@ class EnvironmentDeclarationNodeVisitor < ListVisitor
         def visit_EnvironmentDeclarationNode( node )
             name = node.values[0]
             @environment = configuration.environment( name )
-            @environment = BuildTool::Environment.new( name ) if @environment.nil?
-            configuration.add_environment( @environment )
-            if !configuration.active_feature.nil?
-                @environment.feature = configuration.active_feature
-                configuration.active_feature.environments << @environment
+            if @environment.nil?
+                @environment = BuildTool::Environment.new( name )
+                # Only add a environment to a feature if this is the first time it is declared.
+                configuration.add_environment( @environment )
+                if !configuration.active_feature.nil?
+                    @environment.feature = configuration.active_feature
+                    configuration.active_feature.environments << @environment
+                end
             end
             if node.values[1] == :INHERITANCE
                 parentName = node.values[2]
@@ -362,7 +365,7 @@ def visit_BuildSystemDeclarationNode( node )
 
         def visit_LongDescriptionNode( node )
             if @module.long_description
-                logger.warn "Overwriting long description for feature #{@module.name}"
+                logger.warn "Overwriting long description for module #{@module.name}"
             end
             @module.long_description = node.values
         end
@@ -416,23 +419,24 @@ def visit_ModuleDeclarationNode( node )
                 if inheritance
                     raise ConfigurationError, "Attempt change existing module #{name} with inheritance!"
                 end
-            elsif inheritance
-                parentName = node.values[2]
-                parent = configuration.module( parentName )
-                if parent.nil?
-                    raise ConfigurationError,
-                        "Module %s attempts to inherit from not existant module %s" % 
-                            [ name, parentName ]
+            else
+                parent = nil
+                if inheritance
+                    parentName = node.values[2]
+                    parent = configuration.module( parentName )
+                    if parent.nil?
+                        raise ConfigurationError,
+                            "Module %s attempts to inherit from not existant module %s" % 
+                                [ name, parentName ]
+                    end
                 end
                 @module = BuildTool::Module.new( name, parent )
                 configuration.add_module( @module )
-            else
-                @module = BuildTool::Module.new( name )
-                configuration.add_module( @module )
-            end
-            if !configuration.active_feature.nil?
-                @module.feature = configuration.active_feature
-                configuration.active_feature.modules << @module
+                # Only add a module to a feature if it is the first time declared.
+                if !configuration.active_feature.nil?
+                    @module.feature = configuration.active_feature
+                    configuration.active_feature.modules << @module
+                end
             end
             self.visit_nodes( stmts )
         end

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

@@ -41,7 +41,7 @@ def do_execute( args )
                         FileUtils.rm_rf( cmd.logdir ) if File.exist?( cmd.logdir )
                     end
                 end
-                cmd.delete
+                cmd.destroy
             end
             return 0
         end

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

@@ -25,6 +25,12 @@ def initialize_options
                 @long = true
                 }
             super
+
+            @lines = nil
+            options.on( "-n", "--number [COUNT]", "Number of lines to show." ) { |t|
+                @lines = t.to_i
+                }
+            super
         end
 
         def applicable?
@@ -59,7 +65,7 @@ def show_command( cmd )
 
         def show_command_history
             # *TODO* Make the number of printed command configurable
-            BuildTool::History::CommandLog.last(50).reverse().each do |cmd|
+            BuildTool::History::CommandLog.last(@lines || 50 ).reverse().each do |cmd|
                 show_command cmd
             end
 
@@ -72,7 +78,7 @@ def show_module_history( modname )
                 return usage( "Unknown module #{modname}" )
             end
 
-            BuildTool::History::CommandLog.last_by_module( modname ).reverse.each do |cmd|
+            BuildTool::History::CommandLog.last_by_module( modname, @lines || 3 ).reverse.each do |cmd|
                 show_command( cmd )
 
                 last_module=""

data/lib/build-tool/history.rb

@@ -81,6 +81,11 @@ def before_update
                 end
             end
 
+            def before_destroy
+                self.module_logs_dataset.delete
+                super
+            end
+
             # Class Methods
             class << self
 

metadata

@@ -1,42 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Michael Jansen
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  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-----
+cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2010-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,6 +177,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
+- .gitattributes
+- .gitignore
 - History.txt
 - Manifest.txt
 - README.txt

metadata.gz.sig

@@ -1 +0,0 @@
-%z��0�B*K����3��
�����/�6Zo�������li��X��3�'�T
W�F�u_v'hp���!�#���Wd����S��Y3�U�a��%�q7�� ��@$2��7g�1�_�