autobuild 1.2.1 → 1.2.2

data/Rakefile

@@ -10,7 +10,7 @@ Hoe.new('autobuild', Autobuild::VERSION) do |p|
     p.url         = p.paragraphs_of('README.txt', 1).first.split(/\n/)[1..-1]
     p.changes     = p.paragraphs_of('Changes.txt', 0).join("\n\n")
 
-    p.extra_deps << ['rake', '>= 0.7.0'] << ['utilrb', '>= 1.3']
+    p.extra_deps << ['rake', '>= 0.7.0']
     p.extra_deps << 'rmail'
     p.extra_deps << 'daemons'
 end

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.1" unless defined? Autobuild::VERSION
+    VERSION = "1.2.2" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/import/git.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'autobuild/subcommand'
 require 'autobuild/importer'
-require 'utilrb/module/attr_predicate'
 
 module Autobuild
     class Git < Importer
@@ -20,7 +19,14 @@ module Autobuild
 
         attr_accessor :repository
         attr_accessor :branch
-        attr_predicate :merge?
+
+        # True if it is allowed to merge remote updates automatically. If false
+        # (the default), the import will fail if the updates do not resolve as
+        # a fast-forward
+        def merge?; !!@merge end
+
+        # Set the merge flag. See #merge?
+        def merge=(flag); @merge = flag end
 
         def update(package)
             Dir.chdir(package.srcdir) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-16 00:00:00 +02:00
+date: 2008-07-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: utilrb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.3"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rmail
   type: :runtime