autobuild 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +1 -1
- data/lib/autobuild.rb +1 -1
- data/lib/autobuild/import/git.rb +8 -2
- metadata +2 -12
data/Rakefile
CHANGED
|
@@ -10,7 +10,7 @@ Hoe.new('autobuild', Autobuild::VERSION) do |p|
|
|
|
10
10
|
p.url = p.paragraphs_of('README.txt', 1).first.split(/\n/)[1..-1]
|
|
11
11
|
p.changes = p.paragraphs_of('Changes.txt', 0).join("\n\n")
|
|
12
12
|
|
|
13
|
-
p.extra_deps << ['rake', '>= 0.7.0']
|
|
13
|
+
p.extra_deps << ['rake', '>= 0.7.0']
|
|
14
14
|
p.extra_deps << 'rmail'
|
|
15
15
|
p.extra_deps << 'daemons'
|
|
16
16
|
end
|
data/lib/autobuild.rb
CHANGED
data/lib/autobuild/import/git.rb
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
require 'fileutils'
|
|
2
2
|
require 'autobuild/subcommand'
|
|
3
3
|
require 'autobuild/importer'
|
|
4
|
-
require 'utilrb/module/attr_predicate'
|
|
5
4
|
|
|
6
5
|
module Autobuild
|
|
7
6
|
class Git < Importer
|
|
@@ -20,7 +19,14 @@ module Autobuild
|
|
|
20
19
|
|
|
21
20
|
attr_accessor :repository
|
|
22
21
|
attr_accessor :branch
|
|
23
|
-
|
|
22
|
+
|
|
23
|
+
# True if it is allowed to merge remote updates automatically. If false
|
|
24
|
+
# (the default), the import will fail if the updates do not resolve as
|
|
25
|
+
# a fast-forward
|
|
26
|
+
def merge?; !!@merge end
|
|
27
|
+
|
|
28
|
+
# Set the merge flag. See #merge?
|
|
29
|
+
def merge=(flag); @merge = flag end
|
|
24
30
|
|
|
25
31
|
def update(package)
|
|
26
32
|
Dir.chdir(package.srcdir) do
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: autobuild
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sylvain Joyeux
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2008-07-
|
|
12
|
+
date: 2008-07-17 00:00:00 +02:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
@@ -22,16 +22,6 @@ dependencies:
|
|
|
22
22
|
- !ruby/object:Gem::Version
|
|
23
23
|
version: 0.7.0
|
|
24
24
|
version:
|
|
25
|
-
- !ruby/object:Gem::Dependency
|
|
26
|
-
name: utilrb
|
|
27
|
-
type: :runtime
|
|
28
|
-
version_requirement:
|
|
29
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
30
|
-
requirements:
|
|
31
|
-
- - ">="
|
|
32
|
-
- !ruby/object:Gem::Version
|
|
33
|
-
version: "1.3"
|
|
34
|
-
version:
|
|
35
25
|
- !ruby/object:Gem::Dependency
|
|
36
26
|
name: rmail
|
|
37
27
|
type: :runtime
|