dottor 0.1.0 → 0.2.0

data/Gemfile

@@ -1,3 +1,6 @@
 source "http://rubygems.org"
-gem "thor"
-gem "rspec"
+
+group :development do
+  gem "thor"
+  gem "rspec"
+end

data/README

@@ -0,0 +1,75 @@
+Dottor
+======
+
+Description
+-----------
+Dottor is an unobtrusive command line tool for easily managing your dotfiles,
+without assumptions on how your dotfiles repository should be organized.
+
+Why Dottor?
+-----------
+I designed dottor so that it would be easy to setup and use, reliable and work
+with existing dotfiles repos.
+
+With Dottor you can:
+
+1. Get started with yout current dotfils repo, without changing anything.
+2. Specify different profiles, so that you can use it to symlink files in your
+dev machine as well as in your production boxes.
+
+How it works?
+-------------
+
+Dottor expect to find in your repo a YAML file named dottor_rules.yml (or you
+can specify a different path) with the following format
+
+```ruby
+  profile_name:
+  -  source: <dotffile or directory>
+     target: <where do you want the file to be symlinked to>
+  -  source: <dotffile or directory>
+     target: <where do you want the file to be symlinked to>
+```
+
+All the actions performed by Dottor are based on the dottor_rules.yml file.
+Check my [dotfiles repo][dotfiles_repo] for a working example.
+
+
+Getting started
+---------------
+
+  gem install dottor
+
+### Create a dottor_rules.yml inside your dotfiles repo
+
+  dottor init
+
+### Create symlinks based on dottor_rules.yml file in current directory
+
+  dottor symlink <profile_name>
+
+### Specify a dottor_rules.yml file in another directory
+
+  dottor symlink <profile_name> -f <custom_path>
+
+### Delete all the symlinks
+
+  dottor symlink -d
+
+Submitting a Pull Request
+-------------------------
+
+1. Fork the project.
+2. Create a topic branch.
+3. Implement your feature or bug fix.
+4. Add documentation for your feature or bug fix.
+6. Add specs for your feature or bug fix.
+8. Commit and push your changes.
+
+License
+-------
+Released under the MIT License.  See the [LICENSE][license] file for further
+details.
+
+[license]: https://github.com/marcocampana/dottor/blob/master/LICENSE.md
+[dotfiles_repo]: https://github.com/marcocampana/dotfiles

data/lib/dottor.rb

@@ -14,6 +14,12 @@ module Dottor
       say("Loading rules YAML file")
       rules = YAML::load(yaml_rules)
 
+      if rules[profile_name].nil?
+        $stderr.puts("Error: Profile name not found. Make sure that your dottor_rules yaml file define the profile #{profile_name}")
+        # exit(1)
+        return
+      end
+
       rules[profile_name].each do |mapping|
         dotfile = Dotfile.new(mapping)
         if options[:delete]
@@ -31,7 +37,7 @@ module Dottor
         if options[:force]
           FileUtils.rm 'dottor_rules.yml'
         else
-          say("Abort: dottor_rules.yml already exist. Use the --force to overwrite.")
+          say("Error: dottor_rules.yml already exist. Use the --force to overwrite.")
           exit(1)
         end
       end

data/lib/dottor/dotfile.rb

@@ -9,19 +9,18 @@ module Dottor
 
     def create_symlink
       # If file exists rename it to .old
-      # TODO check if .old file already exists
-      if File.exists?(target)
-        old_file_name = "#{target}.old"
-        FileUtils.mv target, old_file_name
-      end
+      # if File.exists?(target)
+      #   old_file_name = "#{target}.old"
+      #   FileUtils.mv(target, old_file_name) unless File.exists?(old_file_name)
+      # end
 
       # If symlink exists, remove it
-      if File.symlink?(target)
+      if File.exists?(target) || File.symlink?(target)
         FileUtils.rm target
       end
 
       $stdout.puts("Create symlink #{File.join(current_path, source)} -> #{target}")
-      FileUtils.symlink File.join(current_path, source), target
+      FileUtils.symlink(File.join(current_path, source), target)
     end
 
     def delete_symlink

data/lib/dottor/version.rb

@@ -1,3 +1,3 @@
 module Dottor
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/app_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Dottor::App" do
-  describe "symlink" do
+  describe "#symlink" do
     it "should use the dottor_rules.yml in current directory by default" do
       stub_dottor_rules_file('dottor_rules.yml')
       stub_dotfile
@@ -22,5 +22,13 @@ describe "Dottor::App" do
 
       Dottor::App.start(['symlink', 'development'])
     end
+
+    it "should return an error message if profile_name is not found" do
+      stub_dottor_rules_file('dottor_rules.yml')
+
+      capture(:stderr) {
+        Dottor::App.start(['symlink', 'not_defined_profile_name'])
+      }.should =~ /Error: Profile name not found/
+    end
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,19 @@ RSpec.configure do |c|
   c.mock_with :rspec
 
   c.before(:each) do
-    STDOUT.should_receive(:puts).and_return("")
+    # STDOUT.should_receive(:puts).at_least(1).times.and_return("")
+  end
+
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dottor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70257029527160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257029527160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70257029524660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257029524660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Unobtrusive command line tool for easily managing your dotfiles, without
   assumptions on how your dotfiles repository should be organized.
 email:
@@ -46,6 +56,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
+- README
 - README.md
 - bin/dottor
 - dottor.gemspec
@@ -76,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dottor
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command line tool to manage dotfiles the easy way
@@ -85,4 +96,3 @@ test_files:
 - spec/fixtures/dottor_rules.yml
 - spec/helpers/utils.rb
 - spec/spec_helper.rb
-has_rdoc: