gh-diff 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8b0437ed2bd7b0d6f40b2a98fd8e8c57c0bf23e
-  data.tar.gz: edec7e6457db65566fea5f499d742260e3cfa7df
+  metadata.gz: 68850949a7f61cc948ef08629469105a7cb3405b
+  data.tar.gz: b87485464a7d156154aba9cacfa7589412790f8f
 SHA512:
-  metadata.gz: 943ca3f940f8a473216d285bee695abae210302fced1531b58f161d9f3f23963a09b354d7766bc2e01ef0ef169c7b74267ddac93876383ce9ec8b0285508768f
-  data.tar.gz: 50329ebccee2155a3138eb5adefd2eeb1fbda4fd6e2bc757bd6b09d1d14da2e6bcd7adff80f1f99d5d84640240a96f653a6f3e245306c968903cfc8194a5f576
+  metadata.gz: 0f737b7381ec74802e4dd6af8d8df9979f884f3757e03c881b728521d077e136e3579565cb855d0ac8fe773463f5650e8861898b95bcf7babc8f66819c4af399
+  data.tar.gz: 7c6d96caad994c600eab09bb742f0ccb7738c5254b9a011d5864a2ccf90fb6792d6395497a68497c0505925adeec957f808bfd08084a3c85e6606a2aab2b89ab

data/lib/gh-diff/cli.rb

@@ -77,6 +77,7 @@ module GhDiff
 
       ref = gh.ref(opts[:revision], repo:opts[:repo])
 
+      return_flag = 0
       diffs.each do |(f1, f2), diff|
         next if file_not_found?(f1, f2, diff)
         header = "#{ref_format(ref)}--- #{f1}\n+++ #{f2}\n\n"
@@ -88,6 +89,7 @@ module GhDiff
           content = diff.to_s(format)
           unless content.empty?
             save(header + content, opts[:save_dir], f1)
+            return_flag |= 1
           else
             print "\e[32mno Diff on\e[0m #{diff_form}\n"
           end
@@ -100,11 +102,15 @@ module GhDiff
               print header
               print diff.to_s(opts[:format])
             end
+            return_flag |= 1
           else
             print "\e[32mno Diff on\e[0m #{diff_form}\n"
           end
         end
       end
+      # return: 0 - no diff on all files
+      #         1 - diff found on any of files
+      return_flag
     end
 
     desc "dir_diff DIRECTORY", "Print added and removed files in remote repository"
@@ -126,6 +132,7 @@ module GhDiff
 
       gh = init_ghdiff(opts[:repo], opts[:revision], opts[:dir])
       added, removed = gh.dir_diff(dir)
+      return_flag = 0
       if [added, removed].all?(&:empty?)
         puts "\e[33mNothing changed\e[0m"
       else
@@ -161,7 +168,11 @@ module GhDiff
             end
           end
         end
+        return_flag |= 1
       end
+      # return: 0 - nothing changed
+      #         1 - file added or removed
+      return_flag
     rescue GhDiff::NoDirectoryError
       puts "Directory not found: `#{dir}`"
       exit(1)

data/lib/gh-diff/version.rb

@@ -1,3 +1,3 @@
 module GhDiff
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/cassettes/save-diffs.yml

@@ -288,4 +288,75 @@ http_interactions:
       string: '{"ref":"refs/heads/master","url":"https://api.github.com/repos/jekyll/jekyll/git/refs/heads/master","object":{"sha":"3dffa8284f604e4ac87ce6eb4bc8bbaa257da8d8","type":"commit","url":"https://api.github.com/repos/jekyll/jekyll/git/commits/3dffa8284f604e4ac87ce6eb4bc8bbaa257da8d8"}}'
     http_version: 
   recorded_at: Sun, 29 Jun 2014 00:24:08 GMT
+- request:
+    method: get
+    uri: https://api.github.com/repos/jekyll/jekyll/contents/site/docs/migrations.md?ref=master
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.2.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Wed, 30 Jul 2014 12:24:34 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '59'
+      X-Ratelimit-Reset:
+      - '1406726674'
+      Cache-Control:
+      - public, max-age=60, s-maxage=60
+      Last-Modified:
+      - Tue, 29 Jul 2014 23:23:00 GMT
+      Etag:
+      - '"cc1f1604a33f46a76ee717a0bef0d0db"'
+      Vary:
+      - Accept
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Github-Request-Id:
+      - DE962F8B:29B2:22EB0A:53D8E402
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+      X-Served-By:
+      - c436b2b44345c72ff906059f604991e7
+    body:
+      encoding: UTF-8
+      string: '{"name":"migrations.md","path":"site/docs/migrations.md","sha":"a080c6c6ee28720ea347b0e4fe0660e3e333d501","size":359,"url":"https://api.github.com/repos/jekyll/jekyll/contents/site/docs/migrations.md?ref=master","html_url":"https://github.com/jekyll/jekyll/blob/master/site/docs/migrations.md","git_url":"https://api.github.com/repos/jekyll/jekyll/git/blobs/a080c6c6ee28720ea347b0e4fe0660e3e333d501","type":"file","content":"LS0tCmxheW91dDogZG9jcwp0aXRsZTogQmxvZyBtaWdyYXRpb25zCnByZXZf\nc2VjdGlvbjogYXNzZXRzCm5leHRfc2VjdGlvbjogdGVtcGxhdGVzCnBlcm1h\nbGluazogL2RvY3MvbWlncmF0aW9ucy8KLS0tCgpJZiB5b3XigJlyZSBzd2l0\nY2hpbmcgdG8gSmVreWxsIGZyb20gYW5vdGhlciBibG9nZ2luZyBzeXN0ZW0s\nIEpla3lsbOKAmXMgaW1wb3J0ZXJzCmNhbiBoZWxwIHlvdSB3aXRoIHRoZSBt\nb3ZlLiBUbyBsZWFybiBtb3JlIGFib3V0IGltcG9ydGluZyB5b3VyIHNpdGUg\ndG8gSmVreWxsLAp2aXNpdCBvdXIgW2BqZWt5bGwtaW1wb3J0YCBkb2NzIHNp\ndGVdKGh0dHA6Ly9pbXBvcnQuamVreWxscmIuY29tL2RvY3MvaG9tZS8pLgo=\n","encoding":"base64","_links":{"self":"https://api.github.com/repos/jekyll/jekyll/contents/site/docs/migrations.md?ref=master","git":"https://api.github.com/repos/jekyll/jekyll/git/blobs/a080c6c6ee28720ea347b0e4fe0660e3e333d501","html":"https://github.com/jekyll/jekyll/blob/master/site/docs/migrations.md"}}'
+    http_version: 
+  recorded_at: Wed, 30 Jul 2014 12:24:34 GMT
 recorded_with: VCR 2.9.2

data/spec/cli_spec.rb

@@ -75,8 +75,9 @@ describe GhDiff::CLI do
         ARGV.replace %w(diff docs/quickstart.md
                         --repo=jekyll/jekyll --dir=site
                         --name_only=false)
-        GhDiff::CLI.start
+        flag = GhDiff::CLI.start
         expect($stdout.string).to eq @diff_result
+        expect(flag).to eq 1
       end
     end
 
@@ -120,8 +121,9 @@ describe GhDiff::CLI do
       VCR.use_cassette('dir') do
         ARGV.replace %w(dir_diff docs
                         --repo=jekyll/jekyll --dir=site)
-        GhDiff::CLI.start
+        flag = GhDiff::CLI.start
         expect($stdout.string).to match(/New files:.*collections.md/m)
+        expect(flag).to eq 1
       end
     end
 

metadata

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