dotstrap 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd3686fadc94d86089ff7e8f40bdfa7db43af085
-  data.tar.gz: 3560bdacbc4e53321dd17cb4f7cbfbcbe96aa32e
+  metadata.gz: d0ccd6c31b5b1e94988783114e9913c1a407354f
+  data.tar.gz: 6b7703c9ac39592e8f334160e8d523d387c248de
 SHA512:
-  metadata.gz: a7028c7cd87665264456a2bab5e467ee7ddbda601299927971d452078fd37cd9866b4308a13bd0f2084fdfed4ced05075e7851fa7f4c47f2088fa491296e202c
-  data.tar.gz: 14b3269d4a36cd5525a1ea3ff23bcfd5e1171a097f9cdfa1bc459b2636d424c2d0ba46a2201469ee8e33e1b7565465f87e1095201b956d9b5ba67e44d6379602
+  metadata.gz: 6b9890ddd3308ea41aceab5b77c08de8a29df6b0e597c4ac37a6dab8e9c1515401391c5e9e1af866c25939fba15edd8bafcdb7251ba37c1d443c156028e45f67
+  data.tar.gz: 0621d62ce0124555940e435aa5bf59f1e0f0665ab6d39e5107a8508478d39cafd5a77580266147fc38dd21b103dc6b041d14b29e1ccc1f5bb9eeed3b59c6d736

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   # gem.email = Dotstrap::EMAIL
   gem.authors = Dotstrap::AUTHOR
   gem.require_paths = ['lib']
-  gem.executables = ['ds']
+  gem.executables = [Dotstrap::EXE_NAME]
   gem.required_ruby_version = '>=1.9.2'
   gem.metadata = { 'source_code' => Dotstrap::SOURCE_URL, 
                    'documentation' => Dotstrap::DOC_URL

data/bin/{ds → dotstrap}

@@ -24,7 +24,9 @@ $LOG.formatter = proc do |severity, datetime, progname, msg|
 end
 
 def __repo_format_desc; <<-DESC
-  REPO is a GitHub repository slug in the form: `username/repository`
+  REPO is either:
+  \x5    - a GitHub repository clone URL
+  \x5    - a GitHub repository slug in the form: `username/repository`
 
   If REPO is a file: read a newline seperated list of repositories
   (in the form specified above)
@@ -71,7 +73,7 @@ module Dotstrap
       \x5    $ ds install ~/.config/repos.txt
     LONGDESC
     def install(repo, *args)
-      args << repo # so thor will complain when you call `install` with no args
+      args << repo # so thor will not complain when you call `install` with no args
       repos = []
       args.each do |repo|
         if File.exist?(repo)

data/dotstrap.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dotstrap 0.1.2 ruby lib
+# stub: dotstrap 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dotstrap"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.metadata = { "documentation" => "http://www.rubydoc.info/github/mkwmms/dotstrap/master/Dotstrap", "source_code" => "http://github.com/mkwmms/dotstrap" } if s.respond_to? :metadata=
   s.require_paths = ["lib"]
   s.authors = ["William Myers"]
-  s.date = "2015-11-16"
+  s.date = "2015-12-13"
   s.description = "bootstrap your shell dotfiles in parallel from GitHub repos"
-  s.executables = ["ds"]
+  s.executables = ["dotstrap"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.md",
     "Rakefile",
-    "bin/ds",
+    "bin/dotstrap",
     "dotstrap.gemspec",
     "lib/dotstrap.rb",
     "lib/dotstrap/git.rb",
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mkwmms/dotstrap"
   s.licenses = ["MIT"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
-  s.rubygems_version = "2.4.8"
+  s.rubygems_version = "2.4.5.1"
   s.summary = "bootstrap your shell dotfiles in parallel from GitHub repos"
 
   if s.respond_to? :specification_version then

data/lib/dotstrap/git.rb

@@ -4,18 +4,14 @@ require 'logger'
 module Dotstrap
   # TODO: split this into Git < Downloader class
   class Dotstrap::Git
-    attr_accessor :url, :repo,
-                  :repo_path, :repo_name,
-                  :github_user, :github_project
+    attr_accessor :url, :repo, :repo_path, :repo_owner, :repo_name
 
     def initialize(repo, dest_dir = Dotstrap.config_home)
-      @repo = repo
+      @repo = determine_repo_slug(repo)
       # TODO: allow an option to specify to download with SSH or HTTPs from Git
-      @url = "https://github.com/#{@repo}"
-      partition = @repo.partition("/")
-      @github_user = partition[0]
-      @github_project = @repo_name = partition[2]
-      @repo_path = File.join(dest_dir, "#{@github_user}-#{@repo_name}")
+      @url = determine_url(@repo)
+      @repo_owner, @repo_name = split_repo_slug(@repo)
+      @repo_path = File.join(dest_dir, "#{@repo_owner}-#{@repo_name}")
       # @repo_path = File.join(dest_dir, @github_user, @repo_name)
     end
 
@@ -41,6 +37,22 @@ module Dotstrap
 
     private
 
+    def determine_repo_slug(repo)
+      return repo unless repo.start_with?("http", "git@")
+      repo = repo.gsub(/(https?:\/\/github.com\/)|(git@github.com:)/,"")
+      repo = repo.gsub(/.git/,"")
+    end
+
+    def determine_url(repo)
+      return repo if repo.start_with?("http", "git@")
+      "https://github.com/#{repo}"
+    end
+
+    def split_repo_slug(repo, sep = "/")
+      partition = repo.partition(sep)
+      return partition[0], partition[2]
+    end
+
     def git_verbosity
       if $LOG.debug?
         '--verbose'

data/lib/dotstrap.rb

@@ -7,8 +7,8 @@ require_relative 'dotstrap/shell'
 
 module Dotstrap
   NAME        = 'dotstrap'
-  EXE_NAME    = 'ds'
-  VERSION     = '0.1.2'
+  EXE_NAME    = 'dotstrap'
+  VERSION     = '0.2.0'
   AUTHOR      = 'William Myers'
   HOMEPAGE    = 'http://github.com/mkwmms/dotstrap'
   SOURCE_URL  = 'http://github.com/mkwmms/dotstrap'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - William Myers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -153,7 +153,7 @@ dependencies:
 description: bootstrap your shell dotfiles in parallel from GitHub repos
 email: 
 executables:
-- ds
+- dotstrap
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -166,7 +166,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/ds
+- bin/dotstrap
 - dotstrap.gemspec
 - lib/dotstrap.rb
 - lib/dotstrap/git.rb
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: bootstrap your shell dotfiles in parallel from GitHub repos