daun 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTIzNWE5NDBmNTFhM2Q0NzI1ZWUyYWVmYzFkOWU5NjA0ZGI5NzUwMg==
+    ZmJiYjI5NDc0OTg5MzE0MjI0YWI2ZDBjYzc4OWE2NjYyMDVkZDA4ZA==
   data.tar.gz: !binary |-
-    MDU2YTkwM2ViNjY4YTc1MGM1ZjQwYTM3ZWU0MmJkZTYzMWJkOTljYw==
+    NGIxYjZlNWMyYzRjMjg3ZTgwMDEyNWE1Yjg3NTU2MTk0M2YxZDdkMw==
 SHA512:
   metadata.gz: !binary |-
-    NDhlODUwNjkxZjkzZjJjM2MzMDQ2YjE2NTAwODMwMzYyMGIyMmM1YTllMDY4
-    MGY2N2VlYTg4ODY3MmE4OTIzOGNmMGY4OWM4OTI5MTIyYjUxZjYyOWM0ODZl
-    NDVkYTEzYjRmNTBkMzdhNDdlYjFhNDVjYzAwY2MwYTBmMDkxODU=
+    ZGM5NGRmY2MzMDgxN2QwYzVlNTk4ZmJjOTE4N2JiNzNkMTRiOTcwNmJmYzA2
+    NDU1YmQzODg2Mjc2Yjg5YzBiYzE0ODRiNzBiM2FkZjQ1NTJlNDI2MWY4ZjJh
+    ODNlZjNkYTJhMTI0NDYxODliYjRiODliODY4OGYwOGJhNGRlZGI=
   data.tar.gz: !binary |-
-    MTJlNTY1M2I4ODMzMzFiNDc1NTBhOWE2NTAwZGEwZTk1M2JlMzU3ZDNiY2Fh
-    ZjBlYzYyNzYyOTAwYWZkMGY1ODA3NTU1NTlhMDQ2Yjg3Nzc0ZDYxZTQ4YTNk
-    NTE0NjlhYWMzM2JiMzAxMDJkYjI2N2M1MzkyZGRiNWE5N2M4Nzg=
+    YWY1NTQyYmUzOWVkMGJiOTQ2ZGRhNTA5YTY4NGE1NTYzOTUwMjllZDYzY2Qx
+    ZWU3ZTg1NDBhY2FjNTg5Yzc2N2RlYjMzMzczNGVlNjk2MWM2N2Y3MDQ2Yzcz
+    MDY4NGY0NGM4ZTgxNmU5ZjQ3ZGQyNTYzNWY2Yzc0NDgxMTY3NTM=

data/.rubocop.yml

@@ -1,7 +1,7 @@
 LineLength:
   Max: 120
 
-# Adopted from https://github.com/codeclimate/codeclimate/blame/master/config/rubocop/.rubocop.yml
+# Adopted from https://github.com/codeclimate/codeclimate/blob/master/config/rubocop/.rubocop.yml
 Metrics/MethodLength:
   Max: 30
 
@@ -17,4 +17,7 @@ Metrics/ClassLength:
 
 # Conflicts with IntelliJ auto formatting
 Style/MultilineMethodCallIndentation:
+  Enabled: false
+
+Style/CaseIndentation:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [0.2.0] - 2016-11-20
+### Fixed
+\#4 Support fetching SSH URL
+
 ## [0.1.3] - 2016-10-26
 ### Fixed
 \#3 Unable to checkout after setting daun.tag.limit
@@ -14,6 +18,7 @@
 ### Added
 - Initial release.
 
-[Unreleased]: https://github.com/ceilfors/daun/compare/v0.1.3...HEAD
+[Unreleased]: https://github.com/ceilfors/daun/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/ceilfors/daun/compare/v0.1.3...v0.2.0
 [0.1.2]: https://github.com/ceilfors/daun/compare/v0.1.0...v0.1.2
 [0.1.3]: https://github.com/ceilfors/daun/compare/v0.1.2...v0.1.3

data/daun.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     'thor',                      '~> 0.19', '>= 0.19.1'
   spec.add_runtime_dependency     'logging',                   '~> 2.0'
   spec.add_runtime_dependency     'rugged',                    '~> 0.21'
+  spec.add_runtime_dependency     'git_clone_url',             '~> 2.0'
 end

data/lib/daun/cli.rb

@@ -1,5 +1,7 @@
 require 'thor'
 require 'daun'
+require 'uri'
+require 'git_clone_url'
 
 module Daun
   # All daun cli subcommands are made available by this class.
@@ -12,9 +14,32 @@ module Daun
 
     desc 'checkout', 'Checks out git working tree as per daun configuration'
     option :directory, default: '.'
+    option :ssh_private_key, default: File.join(ENV['HOME'], '.ssh', 'id_rsa')
+    option :ssh_public_key, default: File.join(ENV['HOME'], '.ssh', 'id_rsa.pub')
 
     def checkout
-      Daun::RuggedDaun.new(options[:directory]).checkout
+      rugged_daun = Daun::RuggedDaun.new(options[:directory])
+      credentials = nil
+      begin
+        origin_uri = GitCloneUrl.parse(rugged_daun.remote_url)
+        credentials =
+          case origin_uri
+            when URI::SshGit::Generic then
+              Rugged::Credentials::SshKey.new(
+                username: origin_uri.user,
+                privatekey: options[:ssh_private_key],
+                publickey: options[:ssh_public_key]
+              )
+            else
+              # Unsupported URI type
+              credentials = nil
+          end
+      rescue URI::InvalidComponentError
+        # Potentially a git local protocol which is not supported by GitCloneUrl yet
+        credentials = nil
+      end
+
+      rugged_daun.checkout credentials
     end
   end
 end

data/lib/daun/rugged_daun.rb

@@ -28,6 +28,11 @@ module Daun
       @repository.config
     end
 
+    # Returns the remote url set to this repository.
+    def remote_url
+      @repository.remotes['origin'].url
+    end
+
     # Checkout git branches and tags in the git repository working directory.
     #
     # This method will fetch the latest update from `git remote origin` configured
@@ -35,9 +40,13 @@ module Daun
     # Once the references are fetch, it will detect if there are new references,
     # updated references, and deleted references then act upon them
     # accordingly.
-    def checkout
+    def checkout(credentials = nil)
       @logger.info 'Fetching git repository..'
-      refs_diff = fetch_refs
+
+      fetch_options = {}
+      fetch_options[:credentials] = credentials unless credentials.nil?
+
+      refs_diff = fetch_refs fetch_options
 
       refs_diff.added(:remotes).each do |refs|
         @logger.info "Adding #{refs}.."
@@ -75,13 +84,14 @@ module Daun
     private
 
     # Fetch refs from origin.
-    def fetch_refs
+    def fetch_refs(fetch_options = {})
       before_fetch = Hash[@repository.refs.collect { |r| [r.name, r.target_id] }]
 
       # Prune is not supported by rugged! Deleting all remote refs and re-fetch
       delete_all_remote_branches
       delete_all_tags
-      @repository.remotes['origin'].fetch
+
+      @repository.remotes['origin'].fetch(nil, fetch_options)
 
       delete_all_remote_branches @repository.config['daun.branch.blacklist'].split
       delete_all_tags @repository.config['daun.tag.blacklist'].split

data/lib/daun/version.rb

@@ -1,3 +1,3 @@
 module Daun
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daun
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Wisen Tanasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,6 +228,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: git_clone_url
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Daun is a CLI program that will expand git branches and tags to your
   disk as directories. Daun will keep the expanded directories in sync whenever there
   are new, updated, or deleted tags and branches.