ppl 1.12.0 → 1.13.0

data/README.md

@@ -13,7 +13,7 @@ ppl if:
 * You prefer to keep your data stored in an open format
 
 [![Build Status](https://secure.travis-ci.org/h2s/ppl.png)](http://travis-ci.org/h2s/ppl)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/h2s/ppl)
+[![Code Climate](https://codeclimate.com/github/h2s/ppl.png)](https://codeclimate.com/github/h2s/ppl)
 
 Installation
 ------------

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.12.0"
+  Version = "1.13.0"
 
   module Adapter
   end
@@ -60,6 +60,7 @@ require "ppl/command/post"
 require "ppl/command/shell"
 require "ppl/command/url"
 require "ppl/command/version"
+require "ppl/command/execute"
 
 require "ppl/entity/address_book"
 require "ppl/entity/contact"

data/lib/ppl/adapter/storage.rb

@@ -29,5 +29,9 @@ class Ppl::Adapter::Storage
     raise NotImplementedError
   end
 
+  def path
+    raise NotImplementedError
+  end
+
 end
 

data/lib/ppl/adapter/storage/disk.rb

@@ -73,5 +73,9 @@ class Ppl::Adapter::Storage::Disk < Ppl::Adapter::Storage
     File.join(@directory.path, id + ".vcf")
   end
 
+  def path
+    @directory.path
+  end
+
 end
 

data/lib/ppl/adapter/storage/git.rb

@@ -113,5 +113,9 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
     true
   end
 
+  def path
+    @disk.path
+  end
+
 end
 

data/lib/ppl/application/bootstrap.rb

@@ -3,26 +3,27 @@ class Ppl::Application::Bootstrap
 
   def commands
     commands = [
-      Ppl::Command::Init.new,
+      Ppl::Command::Add.new,
+      Ppl::Command::Age.new,
       Ppl::Command::Bday.new,
+      Ppl::Command::Email.new,
       Ppl::Command::Help.new,
-      Ppl::Command::Add.new,
-      Ppl::Command::Rm.new,
+      Ppl::Command::Init.new,
       Ppl::Command::Ls.new,
       Ppl::Command::Mutt.new,
       Ppl::Command::Mv.new,
-      Ppl::Command::Show.new,
       Ppl::Command::Name.new,
       Ppl::Command::Nick.new,
-      Ppl::Command::Email.new,
       Ppl::Command::Org.new,
       Ppl::Command::Phone.new,
       Ppl::Command::Post.new,
+      Ppl::Command::Rm.new,
       Ppl::Command::Shell.new,
+      Ppl::Command::Show.new,
       Ppl::Command::Url.new,
       Ppl::Command::Version.new,
-      Ppl::Command::Age.new,
     ]
+    commands += git_commands
     commands.each do |command|
       command.storage = storage_adapter
     end
@@ -43,6 +44,14 @@ class Ppl::Application::Bootstrap
     return config
   end
 
+  def git_commands
+    [
+      Ppl::Command::Execute.new("pull", "git pull", "Execute 'git pull' in the address book directory"),
+      Ppl::Command::Execute.new("push", "git push", "Execute 'git push' in the address book directory"),
+      Ppl::Command::Execute.new("remote", "git remote", "Execute 'git remote' in the address book directory"),
+    ]
+  end
+
   def input
     input = Ppl::Application::Input.new(ARGV.dup)
     return input

data/lib/ppl/application/shell.rb

@@ -31,7 +31,7 @@ class Ppl::Application::Shell
   end
 
   def prepare_command(command, input)
-    if !command.nil?
+    if !command.nil? && !command.is_a?(Ppl::Command::Execute)
       @optparse = OptionParser.new do |parser|
         command.options(parser, input.options)
       end

data/lib/ppl/command/execute.rb

@@ -0,0 +1,19 @@
+
+class Ppl::Command::Execute < Ppl::Application::Command
+
+  def initialize(name, command, description)
+    @name = name
+    @command = command
+    @description = description
+  end
+
+  def execute(input, output)
+    if !input.arguments.empty?
+      @command += " " + input.arguments.join(" ")
+    end
+    Dir.chdir(@storage.path)
+    Kernel.exec(@command)
+  end
+
+end
+

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.12.0"
-  spec.date        = "2013-02-16"
+  spec.version     = "1.13.0"
+  spec.date        = "2013-02-17"
 
   spec.required_ruby_version = ">= 1.9.3"
 

data/spec/ppl/adapter/storage/disk_spec.rb

@@ -69,6 +69,12 @@ describe Ppl::Adapter::Storage::Disk do
     FakeFS.deactivate!
   end
 
+  describe "#path" do
+    it "should return the path of the directory" do
+      @storage.path.should eq "/contacts"
+    end
+  end
+
   describe "#load_address_book" do
 
     it "should return a Ppl::Entity::AddressBook" do

data/spec/ppl/adapter/storage/git_spec.rb

@@ -16,6 +16,7 @@ describe Ppl::Adapter::Storage::Git do
     Rugged::Repository.stub(:new).and_return(@repo)
 
     @disk.stub(:directory).and_return(Dir.new("/contacts"))
+    @disk.stub(:path).and_return("/contacts")
     @contact.stub(:id).and_return("test")
 
     @git = Ppl::Adapter::Storage::Git.new(@disk)
@@ -27,6 +28,12 @@ describe Ppl::Adapter::Storage::Git do
     FakeFS.deactivate!
   end
 
+  describe "#path" do
+    it "should return the path of the repository" do
+      @git.path.should eq "/contacts"
+    end
+  end
+
   describe "#initialize" do
     it "should accept a disk storage adapter" do
       @git.disk.should be @disk

data/spec/ppl/adapter/storage_spec.rb

@@ -48,5 +48,11 @@ describe Ppl::Adapter::Storage do
     end
   end
 
+  describe "#path" do
+    it "should raise not implemented error" do
+      expect{@storage.path}.to raise_error(NotImplementedError)
+    end
+  end
+
 end
 

data/spec/ppl/application/bootstrap_spec.rb

@@ -92,6 +92,18 @@ describe Ppl::Application::Bootstrap do
     end
   end
 
+  describe "#git_commands" do
+    it "should contain the 'pull' command" do
+      @bootstrap.git_commands[0].name.should eq "pull"
+    end
+    it "should contain the 'push' command" do
+      @bootstrap.git_commands[1].name.should eq "push"
+    end
+    it "should contain the 'remote' command" do
+      @bootstrap.git_commands[2].name.should eq "remote"
+    end
+  end
+
   describe "#configuration" do
     it "should return a Ppl::Application::Configuration" do
       @bootstrap.configuration.should be_a(Ppl::Application::Configuration)

data/spec/ppl/application/shell_spec.rb

@@ -67,6 +67,14 @@ describe Ppl::Application::Shell do
       @shell.run(@input, @output)
     end
 
+    it "should not do any option parsing for Ppl::Command::Execute instances" do
+      execute = Ppl::Command::Execute.new("ls", "ls", "List directory contents")
+      execute.stub(:execute).and_return(true)
+      @shell.should_receive(:select_command).and_return(execute)
+      execute.should_not_receive(:options)
+      @shell.run(@input, @output)
+    end
+
     it "should send exception messages to stderr" do
       @command.should_receive(:options)
       @command.should_receive(:execute) { raise "Pool's Closed" }

data/spec/ppl/command/execute_spec.rb

@@ -0,0 +1,38 @@
+
+describe Ppl::Command::Execute do
+
+  before(:each) do
+    @command = Ppl::Command::Execute.new("remote", "git remote", "Execute 'git remote' in the address book directory")
+    @input   = Ppl::Application::Input.new
+    @output  = double(Ppl::Application::Output)
+    @storage = double(Ppl::Adapter::Storage)
+
+    @storage.stub(:path).and_return("/contacts")
+    @command.storage = @storage
+  end
+
+  describe "#execute" do
+
+    it "should chdir to the location of the address book on disk" do
+      Dir.should_receive(:chdir).with("/contacts")
+      Kernel.stub(:exec)
+      @command.execute(@input, @output)
+    end
+
+    it "should run the specified command" do
+      Dir.stub(:chdir)
+      Kernel.should_receive(:exec).with("git remote")
+      @command.execute(@input, @output)
+    end
+
+    it "should pass arguments through to the command" do
+      @input.arguments = ["--help"]
+      Dir.stub(:chdir)
+      Kernel.should_receive(:exec).with("git remote --help")
+      @command.execute(@input, @output)
+    end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -94,6 +94,7 @@ files:
 - lib/ppl/command/attribute.rb
 - lib/ppl/command/bday.rb
 - lib/ppl/command/email.rb
+- lib/ppl/command/execute.rb
 - lib/ppl/command/help.rb
 - lib/ppl/command/init.rb
 - lib/ppl/command/ls.rb
@@ -160,6 +161,7 @@ files:
 - spec/ppl/command/attribute_spec.rb
 - spec/ppl/command/bday_spec.rb
 - spec/ppl/command/email_spec.rb
+- spec/ppl/command/execute_spec.rb
 - spec/ppl/command/help_spec.rb
 - spec/ppl/command/init_spec.rb
 - spec/ppl/command/ls_spec.rb