gh-diff 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0ca5acb8cb4b38f633229ea7a43fa0b803ab7a
-  data.tar.gz: 6975c4a9e86f67f8b147998b7b8c2b2fb1a16b17
+  metadata.gz: 15521f2f4b02e468636ac647062099620407d809
+  data.tar.gz: 65e651c2a715234b656baff23b367bb0cb5369ae
 SHA512:
-  metadata.gz: 7bac507888d8dcbd305173ac5593328813d22725cf622bf5494f79f4fa86c6e690a56b66bea056a2077d19150e0905d5ed38615453325294db2f808f53037be9
-  data.tar.gz: ec3fc3cfb2d0d7bd1aafdb83a2afc8f5fc1e392f41279bc98254fbe58610aa7ec9b1b37d857075815f16b3745877ad247805d79464bfd1b44e7abe51f2af3b13
+  metadata.gz: a2ce5b3b85a2c8c28f48a5254c81cb76f6af5bb8797aad39aa3a241b614af2d3ea5a597c1616490f9b44b0dc4f1ad3fafaf838cf8112166c3faf178e5538d1ec
+  data.tar.gz: 429c82cb0063b371fbcbf7d8237f2677e63ad8e076a54648cd7092bc704ee7c0230c1465348d41474ce0633ba61b367d7fefaaf597d4e801d557f28931269e54

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.0.0

data/README.md

@@ -1,5 +1,7 @@
 # Gh-Diff
 
+[![Build Status](https://travis-ci.org/melborne/gh-diff.svg?branch=master)](https://travis-ci.org/melborne/gh-diff)
+
 Take diffs between local and a github repository files.
 
 ## Installation

data/lib/gh-diff.rb

@@ -9,9 +9,11 @@ require "diffy"
 require "togglate"
 
 module GhDiff
+  class RepositoryNameError < StandardError; end
   class Diff
     attr_accessor :repo, :revision, :dir
     def initialize(repo, revision:'master', dir:nil)
+      raise RepositoryNameError if repo.nil? || repo.empty?
       @repo = repo
       @revision = revision
       @dir = dir

data/lib/gh-diff/cli.rb

@@ -29,7 +29,7 @@ module GhDiff
       opts = Option.new(options).with_env
       github_auth(opts[:username], opts[:password], opts[:token])
 
-      gh = Diff.new(opts[:repo], revision:opts[:revision], dir:opts[:dir])
+      gh = init_ghdiff(opts[:repo], opts[:revision], opts[:dir])
       if opts[:ref]
         ref = gh.ref(opts[:revision], repo:opts[:repo])
         print "Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]\n"
@@ -71,7 +71,7 @@ module GhDiff
       opts = Option.new(options).with_env
       github_auth(opts[:username], opts[:password], opts[:token])
 
-      gh = Diff.new(opts[:repo], revision:opts[:revision], dir:opts[:dir])
+      gh = init_ghdiff(opts[:repo], opts[:revision], opts[:dir])
       diffs = gh.diff(file1, file2, commentout:opts[:commentout],
                                     comment_tag:opts[:comment_tag])
 
@@ -117,7 +117,7 @@ Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
       opts = Option.new(options).with_env
       github_auth(opts[:username], opts[:password], opts[:token])
 
-      gh = Diff.new(opts[:repo], revision:opts[:revision], dir:opts[:dir])
+      gh = init_ghdiff(opts[:repo], opts[:revision], opts[:dir])
       added, removed = gh.dir_diff(dir)
       if [added, removed].all?(&:empty?)
         puts "\e[33mNothing changed\e[0m"
@@ -133,8 +133,21 @@ Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
       end
     end
 
+    desc "version", "Show gh-diff version"
+    def version
+      puts "gh-diff #{GhDiff::VERSION} (c) 2014 kyoendo"
+    end
+    map "-v" => :version
+
     @@login = nil
     no_tasks do
+      def init_ghdiff(repo, rev, dir)
+        Diff.new(repo, revision:rev, dir:dir)
+      rescue GhDiff::RepositoryNameError
+        puts "Repository should be specified with 'repo' option"
+        exit(1)
+      end
+
       def github_auth(username, password, token)
         return true if @@login
         return false unless token || [username, password].all?
@@ -150,8 +163,9 @@ Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
       end
 
       def save(content, save_dir, file)
-        file = File.join(File.dirname(file), (File.basename(file, '.*') + '.diff'))
-        path = File.join(save_dir, file)
+        dir = (d=File.dirname(file))=='.' ? '' : d
+        file = File.basename(file, '.*') + '.diff'
+        path = File.join(save_dir, dir, file)
         mkdir(File.dirname path)
         File.write(path, content)
         print "\e[32mDiff saved at '#{path}'\e[0m\n"

data/lib/gh-diff/version.rb

@@ -1,3 +1,3 @@
 module GhDiff
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/cli_spec.rb

@@ -49,6 +49,12 @@ describe GhDiff::CLI do
       end
     end
 
+    it "raises an error when repo is empty" do
+      ARGV.replace %w(get docs/quickstart.md --repo=)
+      expect { GhDiff::CLI.start }.to raise_error(SystemExit)
+      expect($stdout.string).to match(/Repository should/)
+    end
+
     context "with ref option" do
       it "also prints reference data of the file" do
         VCR.use_cassette 'quickstart-ref' do
@@ -74,6 +80,12 @@ describe GhDiff::CLI do
       end
     end
 
+    it "raises an error when repo is empty" do
+      ARGV.replace %w(diff docs/quickstart.md --repo=)
+      expect { GhDiff::CLI.start }.to raise_error(SystemExit)
+      expect($stdout.string).to match(/Repository should/)
+    end
+
     context "with save option" do
       it "saves a diff file" do
         VCR.use_cassette('save-diff') do
@@ -112,5 +124,11 @@ describe GhDiff::CLI do
         expect($stdout.string).to match(/New files:.*collections.md/m)
       end
     end
+
+    it "raises an error when repo is empty" do
+      ARGV.replace %w(dir_diff docs/quickstart.md --repo=)
+      expect { GhDiff::CLI.start }.to raise_error(SystemExit)
+      expect($stdout.string).to match(/Repository should/)
+    end
   end
 end

data/spec/gh-diff_spec.rb

@@ -59,6 +59,14 @@ describe GhDiff::Diff do
     Dir.chdir(@original_dir)
   end
 
+  describe ".new" do
+    context "without repo" do
+      it "raises an error" do
+        expect{ GhDiff::Diff.new '' }.to raise_error(GhDiff::RepositoryNameError)
+      end
+    end
+  end
+
   describe "#get" do
     it "returns a file content" do
       VCR.use_cassette('quickstart') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gh-diff
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: togglate