toothpick 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2VkNGY1ZTBhY2M2ZTg3ZWY1MDU2MzJiOTI4MzNlZTlhZmUwYmJlMQ==
+    YmYzYmU2NjJmZTg2MWU2NTNjNWE5OTI1ZDNhMmI3ODNlMmEzMjE5Mw==
   data.tar.gz: !binary |-
-    ZWI0ZmYxYzM3YjhkMGEyMmIyMjczODlkMDhiMmVjMzg5MjJjNThjNg==
+    NDM2YWM0NjVjMDRkN2NkYzVjMDMzYjgzZmM4NmQ3MGJlOTI4ZDlmMw==
 SHA512:
   metadata.gz: !binary |-
-    YWJkOTI5ZWNkNGI4Y2QyYzk4MDU2OTMxZjY5ZDMyNTFlNGNlMmU1YmIwYzgx
-    OTI5NDJiN2EzMWJjYzE2YWY4Zjc2ZTg2MjcwZGM4ZmFiYzM0OWUzY2NiOTE5
-    YzdkYzdjYTFlMjU2ZjEyOGE3YzIwOTNhMDdjNGRhYmRjYTgyODk=
+    NDZiNjQ5YmE3MWZkM2U3ZjE0MTQxODRmYTUyNDdmZjQ5ZmJiZWJjNGRhYWI2
+    N2FmNTcyYjI4NzIxM2Y4MmIwZGQ3Y2Q5NzA4NTM2NjE1Mjk4ZWI3YWY2MjFk
+    MDM5N2ZhNmQ3ZGU4MDgwOTc4YmYxNzg3ZmNiNjU3YjBiYjFiZjg=
   data.tar.gz: !binary |-
-    MTYyODljMjM4MmNkZWU1YjVmOWFiYjFjZTQzNmE4ZmIyNDU4OGUzOTg0OTkw
-    NDkwMDI1YTEzMTQzNzhlOGQzN2E3MDQyMjY3MGU5ODRhYmU4ZDlhMTFiZTRh
-    YzBiZmU1YWY5NGFjYWU2ZDE5MzQxNmQ0NjJmYWMwOTdhZWFjNWI=
+    OGQyNTUyNGM3YWY2OTA5YzJhNWIyYjBiNmJkODJkMTcwNjgxM2UyYmJkMWNi
+    OTViZDExMGE4NjQ3Yzc4NjE1ZDhlYjI0OTFhZjQ3OTVjMzcwNDliNmE3ZDU5
+    NzEyYjQ2YWFkMzRkMzk3OTc4MmFkNDNhODVhMDVmM2M2ZmUwNjM=

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - ruby-head

data/README.md

@@ -1,7 +1,7 @@
-# Toothpick
-![toothpick](http://i39.tinypic.com/2vw7erb.png)
+![toothpick](http://i39.tinypic.com/2vw7erb.png) *For the fine art of picking*
+
+[![Build Status](https://travis-ci.org/code-mancers/toothpick.png?branch=master)](https://travis-ci.org/code-mancers/toothpick)
 
-For the art of picking.
 
 ## Installation
 
@@ -10,7 +10,7 @@ For the art of picking.
 ## Usage
 
     #Setup toothpick
-    toothpick init
+    toothpick init git@github.com:code-mancers/picks.git
 
     #Open today's pick file for editing
     toothpick new

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/lib/toothpick/commands.rb

@@ -7,7 +7,6 @@ module Toothpick
   module Commands
 
     TOOTHPICK_HOME  = ENV['HOME'] + "/.toothpick"
-    PICK_FILENAME   = Date.today.strftime + ".md"
 
     def self.init(picks_repo)
       Git.clone_repo(picks_repo, TOOTHPICK_HOME)
@@ -40,7 +39,11 @@ module Toothpick
       end
 
       def self.pick_file_path
-        File.join(TOOTHPICK_HOME, PICK_FILENAME)
+        File.join(TOOTHPICK_HOME, pick_filename)
+      end
+
+      def self.pick_filename
+        Time.now.utc.to_date.strftime + ".md"
       end
 
   end

data/lib/toothpick/git.rb

@@ -22,7 +22,11 @@ module Toothpick
     def commit
       system("cd #{git_dir} "\
         "&& git add --all "\
-        "&& git commit --allow-empty-message -m ''")
+        "&& git commit -m '#{make_commit_message}'")
+    end
+
+    def make_commit_message
+      "Added pick by #{ENV['USER']} on #{Time.now}"
     end
 
     def push

data/lib/toothpick/search.rb

@@ -4,7 +4,7 @@ module Toothpick
     def initialize(picks_dir, string)
       # Works only with the_silver_searcher for now
       unless `cd #{picks_dir} && ag --version`.nil?
-        space_separated_filenames = `ag -l #{string}`
+        space_separated_filenames = `ag -l #{string}`.split.join(' ')
         unless space_separated_filenames.empty?
           system("$EDITOR #{space_separated_filenames}")
         end

data/lib/toothpick/version.rb

@@ -1,3 +1,3 @@
 module Toothpick
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/commands_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'support/fake_env'
+require 'support/pickfile_shared_examples'
+require 'support/git_shared_examples'
+require 'toothpick/commands'
+
+describe Toothpick::Commands do
+  let(:git_repo) { 'git@github.com:code-mancers/picks.git' }
+  let(:toothpick_home) { Toothpick::Commands::TOOTHPICK_HOME }
+  let(:git) { double(Toothpick::Git) }
+
+  describe "::TOOTHPICK_HOME" do
+    it "should return .toothpick in user's home" do
+      expect(toothpick_home).to eql('/home/user/.toothpick')
+    end
+  end
+
+  describe ".init" do
+    it "should clone the git repo" do
+      Toothpick::Git.should_receive(:clone_repo).with(git_repo, toothpick_home)
+      Toothpick::Commands::init(git_repo)
+    end
+  end
+
+  describe ".new_pick" do
+    before(:each) do
+    end
+    context "when toothpick init was done" do
+      before(:each) do
+        Toothpick::Git.should_receive(:on_git?).and_return(true)
+      end
+
+      include_examples "pickfile should be written successfully"
+      include_examples "it should update, commit and push git"
+
+      specify { Toothpick::Commands::new_pick }
+    end
+
+    context "when toothpick init was not done" do
+      before(:each) do
+        Toothpick::Git.should_receive(:on_git?).and_return(false)
+      end
+
+      it "should raise ToothpickNotInitialized error" do
+        Toothpick::Git.should_not_receive(:new)
+        expect { Toothpick::Commands::new_pick }
+          .to raise_error(Toothpick::Errors::ToothpickNotInitialized)
+      end
+    end
+  end
+end

data/spec/git_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'toothpick/git'
+
+describe Toothpick::Git do
+  describe ".clone_repo" do
+    let(:repo) { 'git@github.com:code-mancers/picks.git' }
+    let(:target_dir) { '/home/emil' }
+    let(:expected_git_command) { "git clone #{repo} #{target_dir}" }
+
+    it "should git clone to target directory" do
+      Toothpick::Git.should_receive(:system).with(expected_git_command)
+      Toothpick::Git::clone_repo(repo, target_dir)
+    end
+  end
+
+  describe ".on_git?" do
+    context "when directory is on git" do
+      it "should return true" do
+        Toothpick::Git.on_git?(Dir.pwd).should be_true
+      end
+    end
+    context "when directory is not on git" do
+      it "should return false" do
+        Toothpick::Git.on_git?('/tmp').should be_false
+      end
+    end
+  end
+
+  describe "Instance methods" do
+    let(:git) { Toothpick::Git.new('/home/emil') }
+    before(:each) do
+      git.should_receive(:system).with(expected_git_command)
+    end
+
+    describe "#update" do
+      let(:expected_git_command) do
+        "cd /home/emil && git pull --rebase"
+      end
+      it "should git pull --rebase" do
+        git.update
+      end
+    end
+
+    describe "#commit" do
+      let(:expected_git_command) do
+        %r{cd /home/emil && git add --all && git commit}
+      end
+      it "should git add and commit without commit message" do
+        git.commit
+      end
+    end
+
+    describe "#push" do
+      let(:expected_git_command) do
+        "cd /home/emil && git push origin master"
+      end
+      it "should git push to origin master" do
+        git.push
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/support/fake_env.rb

@@ -0,0 +1,2 @@
+ENV['HOME'] = '/home/user'
+ENV['EDITOR'] = 'notepad' #heh

data/spec/support/git_shared_examples.rb

@@ -0,0 +1,8 @@
+shared_examples "it should update, commit and push git" do
+  before(:each) do
+    Toothpick::Git.should_receive(:new).with(toothpick_home).and_return(git)
+    git.should_receive(:update)
+    git.should_receive(:commit)
+    git.should_receive(:push)
+  end
+end

data/spec/support/pickfile_shared_examples.rb

@@ -0,0 +1,12 @@
+shared_examples "pickfile should be written successfully" do
+  before(:each) do
+    today_in_utc = Time.now.utc.to_date.strftime
+
+    Kernel.should_receive(:spawn)
+      .with("$EDITOR #{toothpick_home}/#{today_in_utc}.md")
+      .and_return('pid')
+    Process.should_receive(:waitpid).with('pid')
+    $?.should_receive(:success?).and_return(true)
+    File.should_receive(:exists?).and_return(true)
+  end
+end

data/toothpick.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rspec"
   spec.add_dependency "thor"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toothpick
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Emil Soman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,6 +102,13 @@ files:
 - lib/toothpick/git.rb
 - lib/toothpick/search.rb
 - lib/toothpick/version.rb
+- spec/commands_spec.rb
+- spec/git_spec.rb
+- spec/spec_helper.rb
+- spec/support/fake_env.rb
+- spec/support/git_shared_examples.rb
+- spec/support/mock_process_spawn.rb
+- spec/support/pickfile_shared_examples.rb
 - toothpick.gemspec
 homepage: ''
 licenses:
@@ -111,5 +134,11 @@ rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Easily create and share your picks over git
-test_files: []
-has_rdoc: 
+test_files:
+- spec/commands_spec.rb
+- spec/git_spec.rb
+- spec/spec_helper.rb
+- spec/support/fake_env.rb
+- spec/support/git_shared_examples.rb
+- spec/support/mock_process_spawn.rb
+- spec/support/pickfile_shared_examples.rb