dotify 0.6.3 → 0.6.4

data/Gemfile

@@ -1,16 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'thor'
-gem 'multi_json'
-gem 'git'
-
-group :test, :development do
-  gem 'rspec', '~> 2.11.0'
-  gem 'simplecov'
-  gem 'cucumber'
-  gem 'webmock'
-  gem 'vcr'
-
-  gem 'guard-rspec'
-  gem 'guard-cucumber'
-end
+gemspec

data/README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://secure.travis-ci.org/mattdbridges/dotify.png)](http://travis-ci.org/mattdbridges/dotify) [![Dependency Status](https://gemnasium.com/mattdbridges/dotify.png)](https://gemnasium.com/mattdbridges/dotify)
 
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mattdbridges/dotify)
+
 Dotify is a simple CLI tool to make managing dotfiles on your system easy. When developing on a Linux/Unix-based system, keeping track of all of those dotfiles in the home directory can be pain. Some developers do not even bother managing them and many have come up with their own static or even dynamic way of managing them. This is a need in the community, and this tool makes managing these crazy files a breeze.
 
 ## Ruby Version Support

data/dotify.gemspec

@@ -14,4 +14,17 @@ Gem::Specification.new do |gem|
   gem.name          = "dotify"
   gem.require_paths = ["lib"]
   gem.version       = Dotify::VERSION
+
+  gem.add_runtime_dependency "thor", "~> 0.15.4"
+  gem.add_runtime_dependency "multi_json", "~> 1.3.6"
+  gem.add_runtime_dependency "git", "~> 1.2.5"
+
+  gem.add_development_dependency 'rspec', '~> 2.11.0'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'cucumber'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'vcr'
+
+  gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'guard-cucumber'
 end

data/features/step_definitions/setting_up_dotify.rb

@@ -8,5 +8,7 @@ Given /^I have setup Dotify$/i do
 end
 
 When /^I try to setup Dotify$/ do
-  Dotify::CLI.new.setup
+  @cli.stub(:say)
+  @cli.stub(:invoke).with(:edit, [Dotify::Config.file]).once
+  @cli.setup
 end

data/features/support/env.rb

@@ -4,9 +4,15 @@ require 'fileutils'
 
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'dotify'
+require 'cucumber/rspec/doubles'
 
 Before do
   @__orig_home = ENV["HOME"]
+
+  # Stub CLI say method
+  @cli = Dotify::CLI.new
+  @cli.stub(:say)
+
   ENV["HOME"] = "/tmp"
   `rm -rf #{File.join(ENV["HOME"], '.bash_profile')}`
   `rm -rf #{File.join(ENV["HOME"], '.gemrc')}`

data/lib/dotify/cli.rb

@@ -9,9 +9,6 @@ require 'dotify/version_checker'
 
 module Dotify
 
-  class Git
-    include ::Git
-  end
   class CLI < Thor
     include Thor::Actions
     default_task :help
@@ -50,9 +47,8 @@ module Dotify
           repo.commit(message)
         else
           say "No files have been changed in Dotify.", :blue
-          @push = true
         end
-        if @push == true || options[:push] || yes?("Would you like to push these changed to Github (or wherever your remote repo is located)? [Yn]", :blue)
+        if options[:push] || yes?("Would you like to push these changed to Github? [Yn]", :blue)
           say 'Pushing up to Github...', :blue
           begin
             repo.push
@@ -153,11 +149,11 @@ module Dotify
     def link(file = nil)
       return not_setup_warning unless Dotify.installed?
       # Link a single file
-      return link_file Unit.new(file), options unless file.nil?
+      return file_action :link, Unit.new(file), options unless file.nil?
       # Relink the files
-      return Dotify.collection.linked.each { |file| link_file(file, options) } if options[:relink]
+      return Dotify.collection.linked.each { |file| file_action(:link, file, options) } if options[:relink]
       # Link the files
-      Dotify.collection.unlinked.each { |file| link_file(file, options) }
+      Dotify.collection.unlinked.each { |file| file_action(:link, file, options) }
     end
 
     desc 'unlink [[FILENAME]]', "Unlink one or all of your dotfiles (FILENAME is optional)"
@@ -171,9 +167,9 @@ module Dotify
     def unlink(file = nil)
       return not_setup_warning unless Dotify.installed?
       # Unlink a single file
-      return unlink_file Unit.new(file), options unless file.nil?
+      return file_action :unlink, Unit.new(file), options unless file.nil?
       # Unlink the files
-      Dotify.collection.linked.each { |file| unlink_file(file, options) }
+      Dotify.collection.linked.each { |file| file_action(:unlink, file, options) }
     end
 
     no_tasks do
@@ -182,20 +178,20 @@ module Dotify
         say "Dotify has not been setup yet! You need to run 'dotify setup' first.", :yellow
       end
 
-      def unlink_file(file, options = {})
-        say "'#{file}' does not exist in Dotify.", :blue unless file.linked?
-        if options[:force] == true || yes?("Do you want to unlink #{file} from the home directory? [Yn]", :blue)
-          file.unlink
-          say_status :unlinked, file.home
+      def file_action(action, file, options = {})
+        case action.to_sym
+        when :link
+          return say "'#{file.dotfile}' does not exist.", :blue unless file.in_home_dir?
+          return say_status :linked, file.dotfile if file.linked?
+        when :unlink
+          return say "'#{file}' does not exist in Dotify.", :blue unless file.linked?
+        else
+          say "You can't run the action :#{action} on a file."
         end
-      end
 
-      def link_file(file, options = {})
-        return say_status :linked, file.dotfile if file.linked?
-        return say "'#{file}' does not exist in the home directory.", :blue unless file.in_home_dir?
-        if options[:force] == true || yes?("Do you want to link #{file} to the home directory? [Yn]", :blue)
-          file.link
-          say_status :linked, file.home
+        if options[:force] == true || yes?("Do you want to #{action} #{file} #{action.to_sym == :link ? :to : :from} Dotify? [Yn]", :blue)
+          file.send(action) if file.respond_to? action
+          say_status "#{action}ed", file.dotfile
         end
       end
 

data/lib/dotify/unit.rb

@@ -46,7 +46,6 @@ module Dotify
     def dotfile
       @dotfile ||= Config.home(@filename)
     end
-    alias :home :dotfile
 
     def linked?
       in_dotify? && linked_to_dotify?

data/lib/dotify/version.rb

@@ -1,3 +1,3 @@
 module Dotify
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/dotify/version_checker.rb

@@ -5,12 +5,11 @@ module Dotify
   class VersionChecker
     class << self
       def run_check!
-        if @version.nil?
-          resp = Net::HTTP.get('rubygems.org', '/api/v1/versions/dotify.json')
-          json = MultiJson.load(resp)
-          @version = json.map { |v| v['number'] }.max
-        end
-        @version
+        return if !@version.nil?
+
+        resp = Net::HTTP.get('rubygems.org', '/api/v1/versions/dotify.json')
+        json = MultiJson.load(resp)
+        @version = json.map { |v| v['number'] }.max
       end
 
       def current?

data/spec/dotify/cli_spec.rb

@@ -42,14 +42,14 @@ module Dotify
 
     describe CLI, "#link" do
       before do
-        cli.stub(:link_file)
+        cli.stub(:file_action)
       end
       it "should loop through all unlinked files" do
         Dotify.collection.should_receive(:unlinked).and_return Dotify.collection.reject(&:linked?)
         cli.link
       end
       it "should call link_file on the right files" do
-        cli.should_receive(:link_file).exactly(Dotify.collection.unlinked.size).times
+        cli.should_receive(:file_action).exactly(Dotify.collection.unlinked.size).times
         cli.link
       end
       it "should relink all of the files located in Dotify" do
@@ -59,7 +59,7 @@ module Dotify
         cli.link
       end
       it "attempt to link one single file" do
-        cli.should_receive(:link_file).with(an_instance_of(Unit), {})
+        cli.should_receive(:file_action).with(:link, an_instance_of(Unit), {})
         cli.link('.vimrc')
       end
       it "should output a warning if Dotify is not installed" do
@@ -71,18 +71,18 @@ module Dotify
 
     describe CLI, "#unlink" do
       before do
-        cli.stub(:unlink_file)
+        cli.stub(:file_action)
       end
       it "should loop through all unlinked files" do
         Dotify.collection.should_receive(:linked).and_return Dotify.collection.select(&:linked?)
         cli.unlink
       end
       it "should call CLI#unlink_file the right number of times" do
-        cli.should_receive(:unlink_file).exactly(Dotify.collection.linked.size).times
+        cli.should_receive(:file_action).exactly(Dotify.collection.linked.size).times
         cli.unlink
       end
       it "attempt to link one single file" do
-        cli.should_receive(:unlink_file).with(an_instance_of(Unit), {})
+        cli.should_receive(:file_action).with(:unlink, an_instance_of(Unit), {})
         cli.unlink('.vimrc')
       end
       it "should output a warning if Dotify is not installed" do

data/spec/dotify/unit_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 require 'dotify/unit'
 
 class DummyUnit
-  def home
+  def dotfile
     '.dummy'
   end
-  alias :dotfile :home
   def dotify
     '.dotify/.dummy'
   end
@@ -38,13 +37,13 @@ module Dotify
         subject.link.should == false
       end
       it "should copy the file from the home directory if it is not in Dotify" do
-        FileUtils.should_receive(:rm_rf).with(subject.home, :verbose => false)
-        FileUtils.should_receive(:ln_sf).with(subject.dotify, subject.home, :verbose => false)
+        FileUtils.should_receive(:rm_rf).with(subject.dotfile, :verbose => false)
+        FileUtils.should_receive(:ln_sf).with(subject.dotify, subject.dotfile, :verbose => false)
         subject.link
       end
       it "should simply remove the file from the home and relink it" do
         subject.stub(:in_dotify?) { false }
-        FileUtils.should_receive(:cp_r).with(subject.home, subject.dotify, :verbose => false)
+        FileUtils.should_receive(:cp_r).with(subject.dotfile, subject.dotify, :verbose => false)
         FileUtils.stub(:rm_rf)
         FileUtils.stub(:ln_sf)
         subject.link
@@ -60,8 +59,8 @@ module Dotify
       end
       it "should call the right FileUtils methods" do
         subject.stub(:linked?) { true }
-        FileUtils.should_receive(:rm_rf).with(subject.home, :verbose => false)
-        FileUtils.should_receive(:cp_r).with(subject.dotify, subject.home, :verbose => false)
+        FileUtils.should_receive(:rm_rf).with(subject.dotfile, :verbose => false)
+        FileUtils.should_receive(:cp_r).with(subject.dotify, subject.dotfile, :verbose => false)
         FileUtils.should_receive(:rm_rf).with(subject.dotify, :verbose => false)
         subject.unlink
       end
@@ -75,14 +74,14 @@ module Dotify
       it { should respond_to :filename }
       it { should respond_to :dotify }
       it { should respond_to :dotfile }
-      it { should respond_to :home }
+      it { should respond_to :dotfile }
       it { should respond_to :linked? }
       it { should respond_to :linked }
 
       it "should set the attributes properly" do
         unit.filename.should == '.vimrc'
         unit.dotify.should == '/tmp/home/.dotify/.vimrc'
-        unit.home.should == '/tmp/home/.vimrc'
+        unit.dotfile.should == '/tmp/home/.vimrc'
       end
       it "should puts the filename" do
         unit.to_s.should == unit.filename
@@ -92,11 +91,11 @@ module Dotify
     describe "existence in directories" do
       let(:unit) { Unit.new(".bashrc") }
       it "should check for the existence in the home directory" do
-        File.stub(:exists?).with(unit.home).and_return true
+        File.stub(:exists?).with(unit.dotfile).and_return true
         unit.in_home_dir?.should == true
       end
       it "should return false if the file is not in the home directory" do
-        File.stub(:exists?).with(unit.home).and_return false
+        File.stub(:exists?).with(unit.dotfile).and_return false
         unit.in_home_dir?.should_not == true
       end
       it "should check for the existence of the file in Dotify" do
@@ -120,7 +119,7 @@ module Dotify
         unit.linked_to_dotify?.should be_true
       end
       it "should return false if the dotfile is not linked to the Dotify file" do
-        File.stub(:readlink).with(unit.home).and_return '/tmp/home/.another_file'
+        File.stub(:readlink).with(unit.dotfile).and_return '/tmp/home/.another_file'
         unit.linked_to_dotify?.should be_false
       end
     end
@@ -143,11 +142,11 @@ module Dotify
     describe Unit, "#symlink" do
       let!(:unit) { Unit.new(".symlinked") }
       it "should return the symlink for the file" do
-        File.should_receive(:readlink).with(unit.home).once
+        File.should_receive(:readlink).with(unit.dotfile).once
         unit.symlink
       end
       it "should return NoSymlink if error or no symlink" do
-        File.stub(:readlink).with(unit.home).and_raise(StandardError)
+        File.stub(:readlink).with(unit.dotfile).and_raise(StandardError)
         expect { unit.symlink }.not_to raise_error
         unit.symlink.should == NoSymlink
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotify
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,167 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-07-13 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.4
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI Tool for managing your dotfiles
 email:
 - mbridges.91@gmail.com