dotstrap 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 249a0a5f9933e523230f50d14e42f7780ea07003
-  data.tar.gz: 8c5d0586c07392f18d4e7fabed00f4a0f72128d2
+  metadata.gz: 7167b72efc0621e48617fe33eebe36a16db65814
+  data.tar.gz: 2a499c24969d7de214eeb0f8aeee4a889f28f7db
 SHA512:
-  metadata.gz: 672a96c0590edabeed903de3cfd2b3f82f69779885eb6c7d7d556fee9f368026edcd51d16f14241d3790cf028f1a51d52a72a11c080ae01d2ee1b37ae75b69ef
-  data.tar.gz: 7a5fbcac243f56b355fd2baaf8a88980bc30ae516f15cc74b3a3ec03a9e9c86ba1fc78eba75927cb183e8e25c0b50f8606592b61b86dafb50463f0307ad1c329
+  metadata.gz: f43822682d70730bca2c6f8e7420ac38dcd52d5d316671b6471f5d8d7ae50fe04b195e7cdd9ba5878425024a75375145b40a75d84c4799daabad077e060f8392
+  data.tar.gz: 74fe59e42634d474c153eb526129cdbbfb27da611722d0f3cc6fcfabc2094ecb6c9a37ed64e8b458deed9362c4ffb8927c7cd92ae0acdb87029bf1aed17b8401

data/README.md

@@ -30,20 +30,20 @@ rake install
 
 download (or update) and configure `REPOs`:
 ```bash 
-ds install REPO|FILE
+dotstrap install REPO|FILE
 ```
 
 completely remove any symbolic links, `source` statements from dotstrap's config file, & the repository itself:
 ```bash
-ds uninstall REPO
+dotstrap uninstall REPO
 ```
 
 list the URL and install path for all currently installed repositories:
 ```bash
-ds list [REPO]
+dotstrap list [REPO]
 ```
 
-`REPO` is a GitHub repository slug like `mkwmms/dotstrap-osx`
+`REPO` is a GitHub clone URL or repository slug like `mkwmms/dotstrap-osx`
 
 `FILE` is a newline separated list of `REPOS`
 

data/dotstrap.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dotstrap 0.3.1 ruby lib
+# stub: dotstrap 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dotstrap"
-  s.version = "0.3.1"
+  s.version = "0.4.1"
 
   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-12-13"
+  s.date = "2015-12-23"
   s.description = "bootstrap your shell dotfiles in parallel from GitHub repos"
   s.executables = ["dotstrap"]
   s.extra_rdoc_files = [

data/lib/dotstrap.rb

@@ -8,7 +8,7 @@ require_relative 'dotstrap/shell'
 module Dotstrap
   NAME        = 'dotstrap'
   EXE_NAME    = 'dotstrap'
-  VERSION     = '0.3.1'
+  VERSION     = '0.4.1'
   AUTHOR      = 'William Myers'
   HOMEPAGE    = 'http://github.com/mkwmms/dotstrap'
   SOURCE_URL  = 'http://github.com/mkwmms/dotstrap'
@@ -23,7 +23,7 @@ module Dotstrap
     require 'pathname'
 
     def config_home
-      return ENV['DOTSTRAP_CONFIG_HOME'] if ENV.has_key?('DOTSTRAP_CONFIG_HOME')
+      return ENV['DOTSTRAP_CONFIG_DIR'] if ENV.has_key?('DOTSTRAP_CONFIG_DIR')
 
       config_dir = ENV.fetch('XDG_CONFIG_HOME', Dir.home)
       if config_dir == Dir.home

data/lib/dotstrap/git.rb

@@ -11,6 +11,7 @@ module Dotstrap
       # TODO: allow an option to specify to download with SSH or HTTPs from Git
       @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, "#{@repo_owner}-#{@repo_name}")
       # @repo_path = File.join(dest_dir, @github_user, @repo_name)
     end
@@ -48,7 +49,9 @@ module Dotstrap
 
     def split_repo_slug(repo, sep = "/")
       partition = repo.partition(sep)
-      return partition[0], partition[2]
+      # TODO: make dotstrap ansible role compatible
+      # return partition[0], partition[2].gsub("ansible-", "")
+      return partition[0], partition[2].gsub("ansible-", "")
     end
 
     def git_verbosity

data/spec/bundle_spec.rb

@@ -7,9 +7,9 @@ describe Dotstrap::Bundle do
                'mkwmms/fish-basic' =>
                %w(clear.fish mkcd.fish port_kill.fish port_top.fish td.fish)
     }
-    @dotstrap_config_home = Dir.mktmpdir('test_dotstrap_config_home_')
+    @dotstrap_config_dir = Dir.mktmpdir('test_dotstrap_config_dir_')
     # @bundle = FactoryGirl.create :bundle(@config_home, @repos)
-    @bundle = Dotstrap::Bundle.new(@dotstrap_config_home, @repos.keys)
+    @bundle = Dotstrap::Bundle.new(@dotstrap_config_dir, @repos.keys)
   end
 
   describe '#download' do
@@ -18,7 +18,7 @@ describe Dotstrap::Bundle do
       @repos.each do |repo, expected_files|
         # TODO: or should I uses checksums or something?
         actual_files = []
-        Dir.glob(@dotstrap_config_home + repo + '**/*.{fish,sh,zsh}') do |f|
+        Dir.glob(@dotstrap_config_dir + repo + '**/*.{fish,sh,zsh}') do |f|
           actual_files.push File.basename(f)
         end
         actual_files.each { |actual| expect(actual).to eql(expected_files) }
@@ -29,6 +29,6 @@ describe Dotstrap::Bundle do
   # TODO: write test for load_configs
 
   after :all do
-    FileUtils.rm_r @dotstrap_config_home, force: true
+    FileUtils.rm_r @dotstrap_config_dir, force: true
   end
 end

data/spec/shell_spec.rb

@@ -8,13 +8,13 @@ describe Dotstrap::Shell do
                       # 'mkwmms/fish-basic/functions' =>
       # %w(clear.fish mkcd.fish port_kill.fish port_top.fish td.fish)
     }
-    @dotstrap_config_home = Dir.mktmpdir('test_dotstrap_config_home_')
+    @dotstrap_config_dir = Dir.mktmpdir('test_dotstrap_config_dir_')
     @shell_config_home = Dir.mktmpdir('test_dotstrap_shell_config_home_')
     # @bundle = FactoryGirl.create :bundle(@config_home, @repos)
-    @shell = Dotstrap::Shell.new(@dotstrap_config_home, @config_files.keys)
+    @shell = Dotstrap::Shell.new(@dotstrap_config_dir, @config_files.keys)
 
     @config_files.each do |repo, files|
-      dir = File.join(@dotstrap_config_home, repo, 'functions')
+      dir = File.join(@dotstrap_config_dir, repo, 'functions')
       FileUtils.mkdir_p dir
       files.each do |f|
         File.write(File.join(dir, f), 'TEST CONFIG')
@@ -42,7 +42,7 @@ describe Dotstrap::Shell do
       actual_files = []
       expected_files = []
       @config_files.each do |repo, files|
-        dir = File.join(@dotstrap_config_home, repo)
+        dir = File.join(@dotstrap_config_dir, repo)
         actual_files.push @shell.fish_functions(dir)
         files.each do |f|
           expected_files.push File.join(dir, 'functions', f)
@@ -64,7 +64,7 @@ describe Dotstrap::Shell do
   # end
 
   after :all do
-    [@dotstrap_config_home, @shell_config_home].each do |dir|
+    [@dotstrap_config_dir, @shell_config_home].each do |dir|
       FileUtils.rm_r dir, force: true
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - William Myers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize