braid 0.6.1 → 0.6.2

data/braid.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristi Balan", "Norbert Crombach"]
-  s.date = %q{2008-10-29}
+  s.date = %q{2010-07-19}
   s.default_executable = %q{braid}
   s.description = %q{A simple tool for tracking vendor branches in git.}
   s.email = %q{evil@che.lu}
   s.executables = ["braid"]
-  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"]
+  s.files = ["bin/braid", "braid.gemspec", "lib/braid/command.rb", "lib/braid/commands/add.rb", "lib/braid/commands/diff.rb", "lib/braid/commands/push.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"]
   s.has_rdoc = false
   s.homepage = %q{http://evil.che.lu/projects/braid}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.1.0}
   s.summary = %q{A simple tool for tracking vendor branches in git.}
 
-  s.add_dependency(%q<main>, [">= 3.0.0"])
-  s.add_dependency(%q<open4>, [">= 0.9.6"])
+  s.add_dependency(%q<main>, [">= 4.2.0"])
+  s.add_dependency(%q<open4>, [">= 1.0.1"])
 end

data/lib/braid.rb

@@ -1,7 +1,7 @@
 $:.unshift dirname = File.dirname(__FILE__)
 
 module Braid
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 
   CONFIG_FILE = ".braids"
   REQUIRED_GIT_VERSION = "1.6"

data/lib/braid/commands/push.rb

@@ -0,0 +1,48 @@
+require 'fileutils'
+require 'tmpdir'
+
+module Braid
+  module Commands
+    class Push < Command
+      def run(path, options = {})
+        mirror = config.get!(path)
+
+        #mirror.fetch
+
+        base_revision = git.rev_parse(mirror.remote)
+        unless mirror.merged?(base_revision)
+          msg "Mirror is not up to date. Stopping."
+          return
+        end
+
+        diff = mirror.diff
+        if diff.empty?
+          msg "No local changes found. Stopping."
+          return
+        end
+
+        clone_dir = Dir.tmpdir + "/braid_push.#{$$}"
+        Dir.mkdir(clone_dir)
+        source_dir = Dir.pwd
+        remote_url = git.remote_url(mirror.remote)
+        if remote_url == mirror.cached_url
+          remote_url = mirror.url
+        elsif File.directory?(remote_url)
+          remote_url = File.expand_path(remote_url)
+        end
+        Dir.chdir(clone_dir) do
+          msg "Cloning mirror with local changes."
+          git.init
+          git.fetch(source_dir)
+          git.fetch(remote_url)
+          git.checkout(base_revision)
+          git.apply(diff)
+          system("git commit -v")
+          msg "Pushing changes to remote."
+          git.push(remote_url, "HEAD:#{mirror.branch}")
+        end
+        FileUtils.rm_r(clone_dir)
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braid
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Cristi Balan
@@ -15,35 +16,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 +01:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
-        - 3
+        - 4
+        - 2
         - 0
-        - 0
-        version: 3.0.0
+        version: 4.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
+        - 1
         - 0
-        - 9
-        - 6
-        version: 0.9.6
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 description: A simple tool for tracking vendor branches in git.
@@ -60,6 +65,7 @@ files:
 - lib/braid/command.rb
 - lib/braid/commands/add.rb
 - lib/braid/commands/diff.rb
+- lib/braid/commands/push.rb
 - lib/braid/commands/remove.rb
 - lib/braid/commands/setup.rb
 - lib/braid/commands/update.rb
@@ -98,23 +104,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: braid
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: A simple tool for tracking vendor branches in git.