braid 0.6 → 0.6.1

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.
Files changed (5) hide show
  1. data/bin/braid +1 -1
  2. data/braid.gemspec +3 -3
  3. data/lib/braid.rb +1 -1
  4. data/lib/core_ext.rb +13 -0
  5. metadata +6 -4
data/bin/braid CHANGED
@@ -14,7 +14,7 @@ Main {
14
14
  description <<-TXT
15
15
  braid is a simple tool to help track git or svn repositories inside a git repository.
16
16
 
17
- Run 'braid help commandname' for more details.
17
+ Run 'braid commandname help' for more details.
18
18
 
19
19
  All operations will be executed in the braid/track branch.
20
20
  You can then merge back or cherry-pick changes.
data/braid.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = %q{braid}
3
- s.version = "0.6"
3
+ s.version = "0.6.1"
4
4
 
5
5
  s.specification_version = 2 if s.respond_to? :specification_version=
6
6
 
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
11
11
  s.description = %q{A simple tool for tracking vendor branches in git.}
12
12
  s.email = %q{evil@che.lu}
13
13
  s.executables = ["braid"]
14
- s.files = ["bin/braid", "braid.gemspec", "lib/braid/command.rb", "lib/braid/commands/add.rb", "lib/braid/commands/diff.rb", "lib/braid/commands/remove.rb", "lib/braid/commands/setup.rb", "lib/braid/commands/update.rb", "lib/braid/config.rb", "lib/braid/mirror.rb", "lib/braid/operations.rb", "lib/braid.rb", "LICENSE", "Rakefile", "README.textile", "test/braid_test.rb", "test/config_test.rb", "test/fixtures/shiny/README", "test/fixtures/skit1/layouts/layout.liquid", "test/fixtures/skit1/preview.png", "test/fixtures/skit1.1/layouts/layout.liquid", "test/fixtures/skit1.2/layouts/layout.liquid", "test/integration/adding_test.rb", "test/integration/updating_test.rb", "test/integration_helper.rb", "test/mirror_test.rb", "test/operations_test.rb", "test/test_helper.rb"]
14
+ s.files = ["bin/braid", "braid.gemspec", "lib/braid/command.rb", "lib/braid/commands/add.rb", "lib/braid/commands/diff.rb", "lib/braid/commands/remove.rb", "lib/braid/commands/setup.rb", "lib/braid/commands/update.rb", "lib/braid/config.rb", "lib/braid/mirror.rb", "lib/braid/operations.rb", "lib/braid.rb", "lib/core_ext.rb", "LICENSE", "Rakefile", "README.textile", "test/braid_test.rb", "test/config_test.rb", "test/fixtures/shiny/README", "test/fixtures/skit1/layouts/layout.liquid", "test/fixtures/skit1/preview.png", "test/fixtures/skit1.1/layouts/layout.liquid", "test/fixtures/skit1.2/layouts/layout.liquid", "test/integration/adding_test.rb", "test/integration/updating_test.rb", "test/integration_helper.rb", "test/mirror_test.rb", "test/operations_test.rb", "test/test_helper.rb"]
15
15
  s.has_rdoc = false
16
16
  s.homepage = %q{http://evil.che.lu/projects/braid}
17
17
  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
20
20
  s.rubygems_version = %q{1.1.0}
21
21
  s.summary = %q{A simple tool for tracking vendor branches in git.}
22
22
 
23
- s.add_dependency(%q<main>, [">= 2.8.0"])
23
+ s.add_dependency(%q<main>, [">= 3.0.0"])
24
24
  s.add_dependency(%q<open4>, [">= 0.9.6"])
25
25
  end
data/lib/braid.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  $:.unshift dirname = File.dirname(__FILE__)
2
2
 
3
3
  module Braid
4
- VERSION = "0.6"
4
+ VERSION = "0.6.1"
5
5
 
6
6
  CONFIG_FILE = ".braids"
7
7
  REQUIRED_GIT_VERSION = "1.6"
data/lib/core_ext.rb ADDED
@@ -0,0 +1,13 @@
1
+ require 'yaml'
2
+
3
+ class Hash
4
+ def to_yaml(opts = {})
5
+ YAML::quick_emit(object_id, opts) do |out|
6
+ out.map(taguri, to_yaml_style) do |map|
7
+ sort.each do |k,v|
8
+ map.add(k, v)
9
+ end
10
+ end
11
+ end
12
+ end
13
+ end
metadata CHANGED
@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 6
8
- version: "0.6"
8
+ - 1
9
+ version: 0.6.1
9
10
  platform: ruby
10
11
  authors:
11
12
  - Cristi Balan
@@ -25,10 +26,10 @@ dependencies:
25
26
  - - ">="
26
27
  - !ruby/object:Gem::Version
27
28
  segments:
28
- - 2
29
- - 8
29
+ - 3
30
30
  - 0
31
- version: 2.8.0
31
+ - 0
32
+ version: 3.0.0
32
33
  type: :runtime
33
34
  version_requirements: *id001
34
35
  - !ruby/object:Gem::Dependency
@@ -66,6 +67,7 @@ files:
66
67
  - lib/braid/mirror.rb
67
68
  - lib/braid/operations.rb
68
69
  - lib/braid.rb
70
+ - lib/core_ext.rb
69
71
  - LICENSE
70
72
  - Rakefile
71
73
  - README.textile