bard 0.8.21 → 0.8.22
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/VERSION +1 -1
- data/bard.gemspec +4 -4
- data/lib/bard.rb +6 -4
- metadata +3 -3
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.8.
|
|
1
|
+
0.8.22
|
data/bard.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{bard}
|
|
8
|
-
s.version = "0.8.
|
|
8
|
+
s.version = "0.8.22"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Micah Geisel", "Nick Hogle"]
|
|
12
|
-
s.date = %q{2010-03-
|
|
12
|
+
s.date = %q{2010-03-04}
|
|
13
13
|
s.default_executable = %q{bard}
|
|
14
14
|
s.description = %q{This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.}
|
|
15
15
|
s.email = %q{info@botandrose.com}
|
|
@@ -65,8 +65,8 @@ Gem::Specification.new do |s|
|
|
|
65
65
|
s.rubygems_version = %q{1.3.5}
|
|
66
66
|
s.summary = %q{Tools for collaborating with Bot and Rose Design.}
|
|
67
67
|
s.test_files = [
|
|
68
|
-
"spec/
|
|
69
|
-
"spec/
|
|
68
|
+
"spec/bard_spec.rb",
|
|
69
|
+
"spec/spec_helper.rb"
|
|
70
70
|
]
|
|
71
71
|
|
|
72
72
|
if s.respond_to? :specification_version then
|
data/lib/bard.rb
CHANGED
|
@@ -44,23 +44,25 @@ class Bard < Thor
|
|
|
44
44
|
exec "cap data:pull"
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
+
method_options %w( verbose -v ) => :boolean
|
|
47
48
|
desc "pull", "pull changes to your local machine"
|
|
48
49
|
def pull
|
|
49
50
|
ensure_sanity!
|
|
50
51
|
|
|
51
|
-
warn NonFastForwardError unless fast_forward_merge?
|
|
52
|
+
warn NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
|
|
52
53
|
|
|
53
|
-
run_crucial "git pull --rebase origin #{current_branch}"
|
|
54
|
-
run_crucial "rake bootstrap:test"
|
|
54
|
+
run_crucial "git pull --rebase origin #{current_branch}", options.verbose?
|
|
55
|
+
run_crucial "rake bootstrap:test", options.verbose?
|
|
55
56
|
end
|
|
56
57
|
|
|
58
|
+
method_options %w( verbose -v ) => :boolean
|
|
57
59
|
desc "push", "push local changes out to the remote"
|
|
58
60
|
def push
|
|
59
61
|
ensure_sanity!
|
|
60
62
|
|
|
61
63
|
raise SubmoduleDirtyError if submodule_dirty?
|
|
62
64
|
raise SubmoduleUnpushedError if submodule_unpushed?
|
|
63
|
-
raise NonFastForwardError unless fast_forward_merge?
|
|
65
|
+
raise NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
|
|
64
66
|
|
|
65
67
|
run_crucial "git push origin #{current_branch}", true
|
|
66
68
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bard
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.22
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Micah Geisel
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2010-03-
|
|
13
|
+
date: 2010-03-04 00:00:00 -08:00
|
|
14
14
|
default_executable: bard
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
@@ -181,5 +181,5 @@ signing_key:
|
|
|
181
181
|
specification_version: 3
|
|
182
182
|
summary: Tools for collaborating with Bot and Rose Design.
|
|
183
183
|
test_files:
|
|
184
|
-
- spec/spec_helper.rb
|
|
185
184
|
- spec/bard_spec.rb
|
|
185
|
+
- spec/spec_helper.rb
|