thor_subtree 0.0.1 → 0.0.2

data/bin/subtree

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby 
+
+require "rubygems"
+require "thor"
+
+
+class Subtree < Thor
+  include Thor::Actions
+  
+#  git remote add earbits_social git@github.com:earbits/earbits_social.git
+#  git fetch earbits_social
+#  git subtree add -P vendor/plugins/social --squash -m "adding vendor/plugins/social as subtree" earbits_social/master
+  
+  desc "add REPO", "adds a repo to a sub module"
+  method_options :plugin => :string, :branch => :string
+  def add(repo)
+    
+    branch_name = options[:branch] || parse_git(repo)
+    plugin_name = options[:plugin] || (branch_name =~ /^earbits_([a-zA-Z0-9_\-]+)/ && $1)
+  
+    
+    run "git remote add #{branch_name} #{repo}"
+    run "git fetch #{branch_name}"
+    run "git subtree add --squash --prefix=vendor/plugins/#{plugin_name} #{branch_name} master"
+  end
+  
+  
+  desc "pull BRANCH", "Updates a plugin sub module"
+  method_options :plugin => :string, :branch => :string
+  def pull(branch)
+    branch_name = options[:branch] || branch
+    plugin_name = options[:plugin] || (branch_name =~ /^earbits_([a-zA-Z0-9_\-]+)/ && $1)
+    
+    run "git subtree pull --squash --prefix=vendor/plugins/#{plugin_name} #{branch_name} master"
+  end
+  
+  desc "split BRANCH", "Splits changes to a plugin and pushes them to the upstream repo"
+  method_options :plugin => :string, :branch => :string, :since => :string
+  def split(branch)
+    branch_name = options[:branch] || branch
+    plugin_name = options[:plugin] || (branch_name =~ /^earbits_([a-zA-Z0-9_\-]+)/ && $1)
+    since_commit =  options[:since] || ""
+    
+    
+    run "git subtree split --prefix=vendor/plugins/#{plugin_name} #{since_commit} --rejoin --branch #{branch_name}-master"
+    run "git push #{branch_name} #{branch_name}-master:master"
+    run "git branch -D #{branch_name}-master"
+ 
+  end
+  
+  desc "extract BRANCH", "Extracts a plugin and pushes it to an upstream repo"
+  method_options :plugin => :string, :branch => :string, :since => :string
+  def extract(repo)
+    branch_name = options[:branch] || parse_git(repo)
+    plugin_name = options[:plugin] || (branch_name =~ /^earbits_([a-zA-Z0-9_\-]+)/ && $1)
+    since_commit =  options[:since] || ""
+    
+    run "git remote add #{branch_name} #{repo}"
+    run "git fetch #{branch_name}"
+    
+    run "git subtree split --prefix=vendor/plugins/#{plugin_name} --branch #{branch_name}-master"
+    run "git push #{branch_name} #{branch_name}-master:master"
+    run "git branch -D #{branch_name}-master"
+ 
+  end
+  
+  
+  
+
+  private
+  
+  def parse_git(amazon_url)
+    if amazon_url =~ /git@github.com\:[a-zA-Z0-9_\-]*\/([a-zA-Z0-9_\-]+)\.git/
+      return $1
+    else
+      return nil
+    end
+  end
+end
+
+Subtree.start

data/thor_subtree.gemspec

@@ -1,14 +1,16 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "thor_subtree/version"
 
 Gem::Specification.new do |s|
   s.name        = "thor_subtree"
-  s.version     = ThorSubtree::VERSION
+  s.version     = "0.0.2"
+
+  
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Benjamin Bryant"]
   s.email       = [""]
+  s.default_executable = %q{subtree}
   s.homepage    = ""
+  s.executables = ["subtree"]
   s.summary     = %q{thor scripts}
   s.description = %q{for managing git subtree}
 
@@ -17,7 +19,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ["bin"]
 
   s.add_dependency("thor")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor_subtree
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Benjamin Bryant
@@ -16,7 +16,7 @@ bindir: bin
 cert_chain: []
 
 date: 2011-02-22 00:00:00 -08:00
-default_executable: 
+default_executable: subtree
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -35,8 +35,8 @@ dependencies:
 description: for managing git subtree
 email: 
 - ""
-executables: []
-
+executables: 
+- subtree
 extensions: []
 
 extra_rdoc_files: []
@@ -46,9 +46,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
-- lib/task/app.rb
-- lib/thor_subtree.rb
-- lib/thor_subtree/version.rb
+- bin/subtree
 - thor_subtree.gemspec
 has_rdoc: true
 homepage: ""
@@ -58,7 +56,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+- bin
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/lib/task/app.rb

@@ -1,6 +0,0 @@
-class App < Thor
-  desc "test APP_NAME", "install one of the available apps"
-  def test(name)
-	puts name
-  end
-end

data/lib/thor_subtree/version.rb

@@ -1,3 +0,0 @@
-module ThorSubtree
-  VERSION = "0.0.1"
-end

data/lib/thor_subtree.rb

@@ -1,3 +0,0 @@
-module ThorSubtree
-  # Your code goes here...
-end