dotman 0.0.3.4 → 0.0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdba5f26889fa15fafb597bdaa574365e4312b63
-  data.tar.gz: 7f19a42240c7ad4d216e91e61a19e4a1c2e53bb3
+  metadata.gz: 02d61901f1ecaed6d72c8ff3265419cfa6bcd165
+  data.tar.gz: 96bf81094aeecf17c9420cd044b35b8bf7df4e76
 SHA512:
-  metadata.gz: 2cd7340dd7dfa9bccdbdb9ec818eef671b79b40551aca2b39be326a4edef705b1743f27fe5227085fd0c46c255816e02718da1da80f0773e6da45c55c6d55f3f
-  data.tar.gz: 2325f45fa7f4b1b8489bbc43dfcfe166534c3b721d56625186fd4857d7c0af94b442145843145f7e0ba6b08b7f91636f00f1fd9a6ec43a572059c66c79febcc7
+  metadata.gz: 8ec780a62926699bb739936ef8b07613e1187e1659d988f11b05d029bc67594916ec139930cebfe8403325b13e35b8f144efcf1d6ee0f4631e87ffecb4723e50
+  data.tar.gz: 46c94520482a966d98350f1e5e267d802310c1c90c01f535ae4d4edf839fa3e3b70a863868a8111896c7473f2aa8edcf2ece893fdffc46e46e18d23fcffea3b8

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"

data/README.md

@@ -3,7 +3,7 @@ This gem allows you to switch between different dotfiles on the same user accoun
 
 ## Requirements
 
-ruby 1.9, 2.0
+ruby 1.8, 1.9, 2.0
 
 ## Installation
 

data/lib/dotman/dotfile_collection.rb

@@ -26,7 +26,12 @@ DOTFILES_PATH = "#{ENV['HOME']}/.dotman/dotfiles.yml"
 
     def self.find_by_alias(alias_name)
       ensure_default_dotfile_configuration_exists
-      new(dotfiles_yaml.fetch(alias_name))
+      begin
+        found = dotfiles_yaml.fetch(alias_name)
+        new(dotfiles_yaml.fetch(alias_name))
+      rescue KeyError
+        Dotman::Notification.dotfile_collection_not_found(alias_name)
+      end
     end
 
     def self.new_configuration(folder_name, alias_name = nil)

data/lib/dotman/git.rb

@@ -10,11 +10,16 @@ module Dotman
     end
 
     def self.folder_name(git_location)
-      folder_name = git_location.scan(/[^:]+[\/]?dotfile[s?]{1}/).first.gsub('/', '_')
+      folder_name = git_location.scan(/[^:]+[\/]{1}[a-zA-Z0-9]+/).first.gsub('/', '_')
     end
 
     def self.clone_repository(git_location, alias_name = nil)
-      dotfile_location = "#{ENV['HOME']}/.dotman/#{folder_name(git_location)}"
+      if git_location && !git_location.strip.empty?
+        dotfile_location = "#{ENV['HOME']}/.dotman/#{folder_name(git_location)}"
+      else
+        return Dotman::Notification.unspecified_git_path
+      end
+
       if (File.directory?(dotfile_location))
         Dotman::Notification.already_cloned
       else

data/lib/dotman/version.rb

@@ -1,3 +1,3 @@
 module Dotman
-  VERSION = "0.0.3.4"
+  VERSION = "0.0.3.6"
 end

data/spec/integration/dotfile_collection_integration_spec.rb

@@ -17,6 +17,13 @@ describe Dotman::DotfileCollection do
         File.directory?(File.join(Dotman::Base.dotman_folder, 'Timbinous_dotfiles')).should be_true
       end
     end
+
+    context "when dotfile collection is not found" do
+      it "shows the message that the dotfile wasn't found" do
+        Dotman::Notification.should_receive(:dotfile_collection_not_found).with('zach')
+        Dotman::DotfileCollection.find_by_alias('zach')
+      end
+    end
   end
 
   describe ".delete" do
@@ -55,7 +62,7 @@ describe Dotman::DotfileCollection do
   describe ".show_all_aliases" do
     context "when aliases exist in the collection" do
       it "shows all the aliases" do
-        STDOUT.should_receive(:puts).with("default\ntim")
+        STDOUT.should_receive(:puts).with(Dotman::DotfileCollection.all_aliases.join("\n"))
         Dotman::Notification.display_all_aliases
       end
     end

data/spec/integration/git_integration_spec.rb

@@ -11,39 +11,70 @@ describe Dotman::Git do
     Dotman::Base.ensure_current_dotman_file_exists
   end
 
-  context "cloning a new repo" do
-
+  describe ".clone_repository" do
     let (:git_dotfile_repo_path)    { "git@github.com:Timbinous/dotfiles.git" }
     let (:git_folder_name)          { Dotman::Git.folder_name(git_dotfile_repo_path) }
 
-    context "when no alias passed" do
+    context "when the git location is specified" do
+      context "when the git repository has not been cloned yet" do
+        context "when alias was passed" do
 
-      it "clones to the $HOME/.dotman folder" do
-        expect {
-        Dotman::Git.clone_repository(git_dotfile_repo_path) }.
-        to change { File.directory?("#{ENV['HOME']}/.dotman/Timbinous_dotfiles") }.to true
-      end
+          it "clones to the $HOME/.dotman folder" do
+            expect {
+            Dotman::Git.clone_repository(git_dotfile_repo_path, 'tim') }.
+            to change { File.directory?("#{ENV['HOME']}/.dotman/Timbinous_dotfiles") }.to true
+          end
 
-      it "sets the yaml configuration" do
-        Dotman::DotfileCollection.find_by_alias(git_folder_name).should_not be_false
-      end
+          it "sets the yaml configuration relating to the alias" do
+            Dotman::DotfileCollection.find_by_alias('tim').should_not be_false
+          end
+        end
 
-    end
+        context "when no alias passed" do
 
-    context "when alias was passed" do
+          it "clones to the $HOME/.dotman folder" do
+            expect {
+            Dotman::Git.clone_repository(git_dotfile_repo_path) }.
+            to change { File.directory?("#{ENV['HOME']}/.dotman/Timbinous_dotfiles") }.to true
+          end
 
-      it "clones to the $HOME/.dotman folder" do
-        expect {
-        Dotman::Git.clone_repository(git_dotfile_repo_path, 'tim') }.
-        to change { File.directory?("#{ENV['HOME']}/.dotman/Timbinous_dotfiles") }.to true
+          it "sets the yaml configuration relating to the \"git user name\"_\"repo name\"" do
+            Dotman::DotfileCollection.find_by_alias(git_folder_name).should_not be_false
+          end
+        end
       end
 
-      it "sets the yaml configuration" do
-        Dotman::DotfileCollection.find_by_alias('tim').should_not be_false
-      end
+      context "when the git repository has already been cloned" do
+        before :each do
+          Dotman::Git.clone_repository(git_dotfile_repo_path, 'tim')
+        end
 
+        it "sends a notification that this repository has already been cloned"do
+          Dotman::Notification.should_receive(:already_cloned)
+          Dotman::Git.clone_repository(git_dotfile_repo_path, 'tim')
+        end
+      end
+    end
+    
+    context "when the git location was not specified" do
+      it "sends an error notification to the user" do
+        Dotman::Notification.should_receive(:unspecified_git_path)
+        Dotman::Git.clone_repository(nil)
+      end
     end
   end
-  
 
+  describe ".folder_name" do
+    context "when containing a dotfiles repository name in github" do
+      it "returns the username_dotfiles as the folder name" do
+        Dotman::Git.folder_name('git@github.com:Timbinous/dotfiles.git').should == "Timbinous_dotfiles"
+      end
+    end
+
+    context "when containing a random repository name in github" do
+      it "returns the username_randomrepository as the folder name" do
+        Dotman::Git.folder_name('git@github.com:Timbinous/random.git').should == "Timbinous_random"
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 ENV['HOME'] = File.expand_path('../data/home', __FILE__)
 require 'fakefs/spec_helpers'
-require_relative "../lib/dotman"
+require File.expand_path("../../lib/dotman", __FILE__)
 
 def create_home_directory
   FileUtils.mkdir_p(ENV['HOME']) unless File.directory?(ENV['HOME'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotman
 version: !ruby/object:Gem::Version
-  version: 0.0.3.4
+  version: 0.0.3.6
 platform: ruby
 authors:
 - Tim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler