gh-diff 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15521f2f4b02e468636ac647062099620407d809
-  data.tar.gz: 65e651c2a715234b656baff23b367bb0cb5369ae
+  metadata.gz: 3a06727c1dc58fa3d5a219d7b2f6f720f8d0cec2
+  data.tar.gz: 004961bbb8b9e19793d79b5e3bfef515289c97e5
 SHA512:
-  metadata.gz: a2ce5b3b85a2c8c28f48a5254c81cb76f6af5bb8797aad39aa3a241b614af2d3ea5a597c1616490f9b44b0dc4f1ad3fafaf838cf8112166c3faf178e5538d1ec
-  data.tar.gz: 429c82cb0063b371fbcbf7d8237f2677e63ad8e076a54648cd7092bc704ee7c0230c1465348d41474ce0633ba61b367d7fefaaf597d4e801d557f28931269e54
+  metadata.gz: 1ea9453e4b55cabb64dd3f819601d29d0e9e1bb0182086b6e7bd9969ef663ac6d25c55460434d88e23ea2c3eb723022b1be0871de23cb0da81af16251bfceeca
+  data.tar.gz: c322447f5a99d1f35e6299e2055454d7c1548032c4b0cd16666d90a2adb240e41408edac92727d34b9de1ebf5a1841ccb28a2637ed3c8d506bcee135412f7245

data/lib/gh-diff/cli.rb

@@ -113,6 +113,13 @@ Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
     end
 
     desc "dir_diff DIRECTORY", "Print added and removed files in remote repository"
+    option :save,
+            aliases:'-s',
+            default:false,
+            type: :boolean
+    option :save_dir,
+            default:'diff',
+            desc:'save directory'
     def dir_diff(dir)
       opts = Option.new(options).with_env
       github_auth(opts[:username], opts[:password], opts[:token])
@@ -125,6 +132,15 @@ Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
         if added.any?
           puts "\e[33mNew files:\e[0m"
           puts added.map { |f| "  \e[32m" + f + "\e[0m" }
+          if opts[:save]
+            added.each do |f|
+              path = File.join(dir, f)
+              content = gh.get(path)
+              unless content.empty?
+                save(content, opts[:save_dir], path, File.extname(path))
+              end
+            end
+          end
         end
         if removed.any?
           puts "\e[33mRemoved files:\e[0m"
@@ -162,13 +178,13 @@ Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
         FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       end
 
-      def save(content, save_dir, file)
+      def save(content, save_dir, file, ext='.diff')
         dir = (d=File.dirname(file))=='.' ? '' : d
-        file = File.basename(file, '.*') + '.diff'
+        file = File.basename(file, '.*') + ext
         path = File.join(save_dir, dir, file)
         mkdir(File.dirname path)
         File.write(path, content)
-        print "\e[32mDiff saved at '#{path}'\e[0m\n"
+        print "\e[32mFile saved at '#{path}'\e[0m\n"
       end
 
       def file_not_found?(f1, f2, content)

data/lib/gh-diff/version.rb

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

data/spec/cassettes/save-dir-diff.yml

@@ -0,0 +1,145 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.github.com/repos/melborne/gh-diff/contents/bin?ref=master
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.1.2
+      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, 16 Jul 2014 01:04:14 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '57'
+      X-Ratelimit-Reset:
+      - '1405475907'
+      Cache-Control:
+      - public, max-age=60, s-maxage=60
+      Last-Modified:
+      - Sun, 06 Jul 2014 14:29:03 GMT
+      Etag:
+      - '"a98e37e86a4246a85b31e0297c2b068b"'
+      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:5BD6:B8A7707:53C5CF8E
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+      X-Served-By:
+      - 971af40390ac4398fcdd45c8dab0fbe7
+    body:
+      encoding: UTF-8
+      string: '[{"name":"gh-diff","path":"bin/gh-diff","sha":"97f13c6aafe6520b33960b32c398e4c8bbeb4bf7","size":64,"url":"https://api.github.com/repos/melborne/gh-diff/contents/bin/gh-diff?ref=master","html_url":"https://github.com/melborne/gh-diff/blob/master/bin/gh-diff","git_url":"https://api.github.com/repos/melborne/gh-diff/git/blobs/97f13c6aafe6520b33960b32c398e4c8bbeb4bf7","type":"file","_links":{"self":"https://api.github.com/repos/melborne/gh-diff/contents/bin/gh-diff?ref=master","git":"https://api.github.com/repos/melborne/gh-diff/git/blobs/97f13c6aafe6520b33960b32c398e4c8bbeb4bf7","html":"https://github.com/melborne/gh-diff/blob/master/bin/gh-diff"}}]'
+    http_version: 
+  recorded_at: Wed, 16 Jul 2014 01:04:14 GMT
+- request:
+    method: get
+    uri: https://api.github.com/repos/melborne/gh-diff/contents/bin/gh-diff?ref=master
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.1.2
+      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, 16 Jul 2014 01:04:15 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '56'
+      X-Ratelimit-Reset:
+      - '1405475907'
+      Cache-Control:
+      - public, max-age=60, s-maxage=60
+      Last-Modified:
+      - Thu, 10 Jul 2014 01:28:49 GMT
+      Etag:
+      - '"ea0aae4ec6b8ddf249d9c8f9c21e8f90"'
+      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:5BD7:F28324F:53C5CF8E
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+      X-Served-By:
+      - 03d91026ad8428f4d9966d7434f9d82e
+    body:
+      encoding: UTF-8
+      string: '{"name":"gh-diff","path":"bin/gh-diff","sha":"97f13c6aafe6520b33960b32c398e4c8bbeb4bf7","size":64,"url":"https://api.github.com/repos/melborne/gh-diff/contents/bin/gh-diff?ref=master","html_url":"https://github.com/melborne/gh-diff/blob/master/bin/gh-diff","git_url":"https://api.github.com/repos/melborne/gh-diff/git/blobs/97f13c6aafe6520b33960b32c398e4c8bbeb4bf7","type":"file","content":"IyEvdXNyL2Jpbi9lbnYgcnVieQoKcmVxdWlyZSAnZ2gtZGlmZicKCkdoRGlm\nZjo6Q0xJLnN0YXJ0KEFSR1YpCg==\n","encoding":"base64","_links":{"self":"https://api.github.com/repos/melborne/gh-diff/contents/bin/gh-diff?ref=master","git":"https://api.github.com/repos/melborne/gh-diff/git/blobs/97f13c6aafe6520b33960b32c398e4c8bbeb4bf7","html":"https://github.com/melborne/gh-diff/blob/master/bin/gh-diff"}}'
+    http_version: 
+  recorded_at: Wed, 16 Jul 2014 01:04:15 GMT
+recorded_with: VCR 2.9.2

data/spec/cli_spec.rb

@@ -94,7 +94,7 @@ describe GhDiff::CLI do
                         --save)
           GhDiff::CLI.start
           path = 'diff/docs/quickstart.diff'
-          expect($stdout.string).to match(/Diff saved at '#{path}'/)
+          expect($stdout.string).to match(/File saved at '#{path}'/)
           expect(File.exist? path).to be true
           expect(File.read path).to match(/-prev_section: old-home/)
         end
@@ -130,5 +130,19 @@ describe GhDiff::CLI do
       expect { GhDiff::CLI.start }.to raise_error(SystemExit)
       expect($stdout.string).to match(/Repository should/)
     end
+
+    context "with save option" do
+      it "saves new files" do
+        VCR.use_cassette('save-dir-diff') do
+          ARGV.replace %w(dir_diff bin
+                          --repo=melborne/gh-diff
+                          --save)
+          GhDiff::CLI.start
+          path = "diff/bin/gh-diff"
+          expect(File.exist? path).to be true
+          expect(File.read path).to match(/require.*gh-diff/)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gh-diff
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: togglate
@@ -197,6 +197,7 @@ files:
 - spec/cassettes/ref.yml
 - spec/cassettes/save-diff.yml
 - spec/cassettes/save-diffs.yml
+- spec/cassettes/save-dir-diff.yml
 - spec/cli_spec.rb
 - spec/fixtures/docs/migrations.md
 - spec/fixtures/docs/quickstart.md
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Take diffs between local and a github repository files.
@@ -239,6 +240,7 @@ test_files:
 - spec/cassettes/ref.yml
 - spec/cassettes/save-diff.yml
 - spec/cassettes/save-diffs.yml
+- spec/cassettes/save-dir-diff.yml
 - spec/cli_spec.rb
 - spec/fixtures/docs/migrations.md
 - spec/fixtures/docs/quickstart.md