pullable 0.0.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c72eee2e32e955b9e0ccc101eeb0dab1547f387
-  data.tar.gz: 7697adc78e13837c90252ab6b5aef25911b708aa
+  metadata.gz: ba1c8bbf6d383e5772d0cf55811f4afc961e3b63
+  data.tar.gz: e83d49e8d69e26d12babda9ccf6778720372995d
 SHA512:
-  metadata.gz: 5a5c8e1fcc6da41419013d7fc1c4fc9ae6b1151901c63e41912cf31f359cf8d925bb76e7927275b2f81047802648ef831029548c18ed90d383758b119b057b3f
-  data.tar.gz: d79fe282915e8535fb150289de3fd52bfd61123302a99037d2a380719c1fad576fefae72a32af9565f8cfb7353ce90384d012b2d85f8c19a3f34b3daae7f6942
+  metadata.gz: ab68f3c9aacd86de1e4fc6f349bbfba9867b0f8302dbe41cb6b1762bcd4c29cc85d6fae38cd2f159fc0db087269238ca7c315c7199ac9f8890e9e3353ee52726
+  data.tar.gz: 66c727d42f2cfccd7ea70789fd64b2b341a6bb5caed73554a629c9103b919858d3c5277982ebc43850e7b0f81a7fa322b4d8bf9e75deb85f20aaa0aa83218bfe

data/README.md

@@ -1,5 +1,7 @@
 # Pullable
 
+[![Build Status](https://travis-ci.org/itsmeduncan/pullable.png?branch=master)](https://travis-ci.org/itsmeduncan/pullable)
+
 Loop over a directory of Git repositories, fetch, and fast-forward merge from
 origin.
 
@@ -19,9 +21,28 @@ Or install it yourself as:
 
 ## Usage
 
-```ruby
-pullable ~/Projects
-```
+    ls ~/Projects
+    foo    bar    .DS_Store
+
+    pullable ~/Projects
+    # cd ~/Projects
+    # cd ~/Projects/foo
+    # git fetch -p && git merge --ff-only origin/master
+    # cd ~/Projects/bar
+    # git fetch -p && git merge --ff-only origin/master
+     
+    pullable ~/Projects pull
+    # cd ~/Projects
+    # cd ~/Projects/foo
+    # git fetch -p && git pull origin master
+    # cd ~/Projects/bar
+    # git fetch -p && git pull origin master
+
+## TODO
+
+* Logging
+* Finer grain command line options
+* Grit?
 
 ## Contributing
 

data/bin/pullable

@@ -2,4 +2,4 @@
 
 require 'pullable'
 
-Pullable.process!(ARGF.argv[0])
+Pullable.process!(ARGF.argv[0], ARGF.argv[1])

data/lib/pullable/directory.rb

@@ -0,0 +1,60 @@
+require 'fileutils'
+
+module Pullable
+  class Directory
+
+    VALID_METHODS = ['pull', 'merge']
+    SKIPPED_DIRECTORIES = ['.DS_Store']
+
+    attr_reader :path, :method
+
+    def initialize(path, method)
+      unless File.directory?(path)
+        raise ArgumentError.new('Please pass a directory that exists!')
+      end
+
+      unless VALID_METHODS.include?(method)
+        raise ArgumentError.new("#{method} cannot be used to update the repo!")
+      end
+
+      @path   = path
+      @method = method
+    end
+
+    def process!
+      Dir.foreach(path) do |directory|
+        if File.directory?(directory)
+          unless SKIPPED_DIRECTORIES.include?(directory)
+            FileUtils.cd(directory)
+
+            if File.directory?('.git')
+              puts "Updated:\t#{directory}"
+              update!
+            end
+
+            FileUtils.cd(path)
+          end
+        end
+      end
+    end
+
+    def self.process!(path, method = 'merge')
+      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/version.rb

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

data/lib/pullable.rb

@@ -1,42 +1,14 @@
-require "pullable/version"
-require "fileutils"
-
-SKIPPED_DIRECTORIES = ['.DS_Store']
+require 'pullable/directory'
+require 'pullable/version'
 
 module Pullable
 
-  def self.process!(root)
-    pulled, skipped, failed = [], [], []
-
-    raise ArgumentError.new("Please pass a root directoy!") if root.nil?
-    raise ArgumentError.new("Please pass a valid root directoy!") unless File.directory?(root)
-
-    Dir.foreach(root) do |directory|
-      if File.directory?(directory)
-        unless SKIPPED_DIRECTORIES.include?(directory)
-          FileUtils.cd(directory)
-
-          if File.directory?('.git')
-            puts "Pulling:\t#{directory}"
-            `git fetch -p`
-            `git merge --ff-only origin/master`
-          end
-
-          unless $?.success?
-            failed << directory
-          else
-            pulled << directory
-          end
-
-          FileUtils.cd(root)
-        end
-      else
-        skipped << directory
-      end
+  def self.process!(path, method = 'merge')
+    if method == '' || method == nil
+      method = 'merge'
     end
 
-    puts "Pulled:\t\t#{pulled.inspect}" unless pulled.empty?
-    puts "Skipped:\t#{skipped.inspect}" unless skipped.empty?
-    puts "Failed:\t\t#{failed.inspect}" unless failed.empty?
+    Pullable::Directory.process!(path, method)
   end
+
 end

data/pullable.gemspec

@@ -4,21 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pullable/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "pullable"
+  spec.name          = 'pullable'
   spec.version       = Pullable::VERSION
-  spec.authors       = ["Duncan Grazier"]
-  spec.email         = ["itsmeduncan@gmail.com"]
+  spec.authors       = ['Duncan Grazier']
+  spec.email         = ['itsmeduncan@gmail.com']
   spec.description   = %q{Update your Git repositories}
   spec.summary       = %q{A simple tool to update your local repositories}
-  spec.homepage      = "https://github.com/itsmeduncan/pullable"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/itsmeduncan/pullable'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
 end

data/spec/lib/pullable/directory_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Pullable::Directory do
+
+  describe '.new' do
+    it 'raises if the directory does not exist' do
+      File.expects(:directory?).with('foo').returns(false)
+
+      expect {
+        described_class.new('foo', 'merge')
+      }.to raise_error(ArgumentError, 'Please pass a directory that exists!')
+    end
+
+    it 'raises if the method is invalid' do
+      expect {
+        described_class.new('.', 'foo')
+      }.to raise_error(ArgumentError, 'foo cannot be used to update the repo!')
+    end
+  end
+
+  describe '#process!' do
+    it 'initializes a new Pullable::Directory with the given parameters' do
+      Pullable::Directory.expects(:new).with('foo', 'bar').returns(mock(:process! => true))
+      Pullable::Directory.process!('foo', 'bar')
+    end
+
+    it 'defaults the method to merge' do
+      Pullable::Directory.expects(:new).with('foo', 'merge').returns(mock(:process! => true))
+      Pullable::Directory.process!('foo')
+    end
+  end
+
+  describe '.process!' do
+    it 'calls update for each directory that has a .git under the root'
+    it 'skips known weird directories'
+    it 'skips non-git repos'
+  end
+
+  describe '#update!' do
+    it 'calls the correct system command' do
+      directory = described_class.new('.', 'merge')
+      directory.expects(:system).with('git fetch -p && git merge --ff-only origin/master > /dev/null')
+
+      directory.update!
+    end
+  end
+
+  describe "#command" do
+    it 'generates the merge command' do
+      directory = described_class.new('.', 'merge')
+      directory.command.should == 'git merge --ff-only origin/master'
+    end
+
+    it 'generates the pull command' do
+      directory = described_class.new('.', 'pull')
+      directory.command.should == 'git pull origin master'
+    end
+  end
+
+end

data/spec/pullable_spec.rb

@@ -6,4 +6,19 @@ describe Pullable do
     Pullable::VERSION.should_not be_nil
   end
 
+  it 'calls process! with the correct arguments' do
+    Pullable::Directory.expects(:process!).with('foo', 'bar')
+    Pullable.process!('foo', 'bar')
+  end
+
+  it 'handles a blank string for the method' do
+    Pullable::Directory.expects(:process!).with('foo', 'merge')
+    Pullable.process!('foo', '')
+  end
+
+  it 'handles a nil method' do
+    Pullable::Directory.expects(:process!).with('foo', 'merge')
+    Pullable.process!('foo')
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,2 +1,10 @@
+require 'simplecov'
+SimpleCov.start
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'pullable'
+require 'mocha/api'
+
+RSpec.configure do |config|
+  config.mock_framework = :mocha
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pullable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Duncan Grazier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Update your Git repositories
 email:
 - itsmeduncan@gmail.com
@@ -71,8 +99,10 @@ files:
 - Rakefile
 - bin/pullable
 - lib/pullable.rb
+- lib/pullable/directory.rb
 - lib/pullable/version.rb
 - pullable.gemspec
+- spec/lib/pullable/directory_spec.rb
 - spec/pullable_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/itsmeduncan/pullable
@@ -100,5 +130,6 @@ signing_key:
 specification_version: 4
 summary: A simple tool to update your local repositories
 test_files:
+- spec/lib/pullable/directory_spec.rb
 - spec/pullable_spec.rb
 - spec/spec_helper.rb