pullable 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba1c8bbf6d383e5772d0cf55811f4afc961e3b63
-  data.tar.gz: e83d49e8d69e26d12babda9ccf6778720372995d
+  metadata.gz: 2cf7eb1ec2b03ee87fbf43db2856d60fcb247b28
+  data.tar.gz: b0519adbb9ed78955ef46ebdadf52a99b0a03a91
 SHA512:
-  metadata.gz: ab68f3c9aacd86de1e4fc6f349bbfba9867b0f8302dbe41cb6b1762bcd4c29cc85d6fae38cd2f159fc0db087269238ca7c315c7199ac9f8890e9e3353ee52726
-  data.tar.gz: 66c727d42f2cfccd7ea70789fd64b2b341a6bb5caed73554a629c9103b919858d3c5277982ebc43850e7b0f81a7fa322b4d8bf9e75deb85f20aaa0aa83218bfe
+  metadata.gz: 727c6285d78c34db3998537947f36e675ff2af81f5d74837e441bccd2fe8911329e1dd2867bcc3df9ee7c617bdb517ae9391179bf1ce28ee5fe81837db9cd68b
+  data.tar.gz: 60bc1fb5276cd152858964259e6ab3d828aa2dda6acff14eac80bec698902359ed49df00cc33fce0a8f434e362f36e6fc88735e5ba94df25ef111df85746bad3

data/.pullable.yml.example

@@ -0,0 +1,2 @@
+mirror:
+  remote: :upstream

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p0
+ruby-2.0.0-p247

data/lib/pullable/directory.rb

@@ -27,9 +27,8 @@ module Pullable
           unless SKIPPED_DIRECTORIES.include?(directory)
             FileUtils.cd(directory)
 
-            if File.directory?('.git')
-              puts "Updated:\t#{directory}"
-              update!
+            if Dir.exists?('.git')
+              Pullable::Processor.update!(method, directory)
             end
 
             FileUtils.cd(path)
@@ -42,19 +41,5 @@ module Pullable
       new(path, method).process!
     end
 
-    def update!
-      system "git fetch -p && #{command} > /dev/null"
-    end
-
-    def command
-      case @method
-      when 'merge'
-        'git merge --ff-only origin/master'
-      when 'pull'
-        'git pull origin master'
-      else
-        raise NotImplementedError
-      end
-    end
   end
 end

data/lib/pullable/processor.rb

@@ -0,0 +1,50 @@
+require 'yaml'
+
+class Pullable::Processor
+
+  CONFIG_FILE = ".pullable.yml"
+
+  attr_reader :method, :directory, :options
+
+  def initialize(method, directory, options = {})
+    @method    = method
+    @directory = directory
+    @options   = options
+  end
+
+  def self.update!(method, directory)
+    options   = File.exists?(CONFIG_FILE) ? YAML.load(File.read(CONFIG_FILE)) : {}
+    processor = new(method, directory, options)
+
+    if processor.options['mirror']
+      processor.mirror!(options)
+    else
+      processor.update!(options)
+    end
+  end
+
+  def mirror!(options = {})
+    remote = options['mirror']['remote'] rescue 'upstream'
+    run "git pull #{remote} master && git push origin master"
+  end
+
+  def update!(options = {})
+    run "git fetch -p && #{command}"
+  end
+
+  def run(command)
+    puts "Updating:\t#{directory}"
+    system "#{command} > /dev/null"
+  end
+
+  def command
+    case method
+    when 'merge'
+      'git merge --ff-only origin/master'
+    when 'pull'
+      'git pull origin master'
+    else
+      raise NotImplementedError
+    end
+  end
+end

data/lib/pullable/version.rb

@@ -1,3 +1,3 @@
 module Pullable
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/pullable.rb

@@ -1,4 +1,5 @@
 require 'pullable/directory'
+require 'pullable/processor'
 require 'pullable/version'
 
 module Pullable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pullable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Duncan Grazier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .pullable.yml.example
 - .rspec
 - .ruby-gemset
 - .ruby-version
@@ -100,6 +101,7 @@ files:
 - bin/pullable
 - lib/pullable.rb
 - lib/pullable/directory.rb
+- lib/pullable/processor.rb
 - lib/pullable/version.rb
 - pullable.gemspec
 - spec/lib/pullable/directory_spec.rb
@@ -125,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: A simple tool to update your local repositories