dotbox 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1494797e72fbe4c6c0674e381507e7a895cd9ee8
+  data.tar.gz: 268e762ea6c0221fe7def07f4ee6198cb2a06fd2
+SHA512:
+  metadata.gz: b123b224b89b3a7f0997176dd4d1a953c125769f62875198ac7021b6ee361ef08ec6487ab73ba83010441940922ff364c02294412928c807d28cee11fac2040e
+  data.tar.gz: 8d08bcf449d0d712094442ae8e97f44320da1b3e618a4cd1d298b5743809a2cd2f36fd2c0021814c37f749bb19eb1103a89fa7e8165f9eba174b54319269d24b

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dotbox (1.0.0)
+    dotbox (1.0.2)
       thor
 
 GEM
@@ -24,6 +24,7 @@ GEM
     gherkin (2.11.6)
       json (>= 1.7.6)
     json (1.7.7)
+    rake (10.1.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -32,7 +33,7 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
-    thor (0.17.0)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
@@ -40,4 +41,5 @@ PLATFORMS
 DEPENDENCIES
   aruba
   dotbox!
+  rake
   rspec

data/README.md

@@ -1,5 +1,7 @@
 # Dotbox
 
+[![Build Status](https://travis-ci.org/yesmeck/dotbox.png?branch=master)](https://travis-ci.org/yesmeck/dotbox)
+
 Backup your dotfiles to dropbox and restore them easily.
 
 ## Installation
@@ -38,4 +40,10 @@ $ mv /home/meck/Dropbox/Apps/Dotbox/.zshrc /home/meck.zshrc
 
 When you run `dotbox restore` it will link all files in dropbox to  their original postions.
 
+## Not only dotfiles
+
+Acturally, dotbox can take care of any files or directories under your $HOME directory. For example:
+```
+$ dotbox add .oh-my-fish/custom
+```
 

data/Rakefile

@@ -1,9 +1,12 @@
 require "bundler"
-require "rspec/core/rake_task"
+require 'cucumber'
+require 'cucumber/rake/task'
 
 Bundler::GemHelper.install_tasks
 
-RSpec::Core::RakeTask.new(:spec)
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
+end
 
-task :default => :spec
-task :test => :spec
+task :default => :features
+task :test => :features

data/dotbox.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor'
   s.add_development_dependency 'aruba'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
 end

data/features/add.feature

@@ -51,4 +51,10 @@ Feature: add file to dropbox
     And the link named "foo/baz" should be a link of "dropbox/Apps/Dotbox/foo/baz"
     And the record file should contain "foo/baz" => "file"
 
+  @announce
+  Scenario: add a file twice
+    Given a backup file named "foo/bar"
+    Given an empty file named "foo/bar"
+    When I run `dotbox add foo/bar`
+    Then the stdout should contain "foo/bar has been backuped."
 

data/features/restore.feature

@@ -14,3 +14,11 @@ Feature: restore backuped files
     And a link named "baz/bar" should exist
     And the link named "baz/bar" should be a link of "dropbox/Apps/Dotbox/baz/bar"
 
+  @announce
+  Scenario: restore a exist file
+    Given a backup file named "foo/bar"
+    Given an empty file named "foo/bar"
+    When I run `dotbox restore`
+    Then a link named "foo/bar" should exist
+    And a file named "foo/bar.bak" should exist
+

data/lib/dotbox/cli.rb

@@ -2,6 +2,7 @@ require 'dotbox'
 require 'dotbox/config'
 require 'dotbox/file'
 require 'dotbox/record'
+require 'dotbox/version'
 
 module Dotbox
   class CLI < Thor
@@ -21,10 +22,14 @@ module Dotbox
           die "#{path} not exists."
         end
         Dir[path].each do |p|
-          p = ::File.expand_path(p)
-          file = File.new(p)
-          file.backup
-          @record.add file
+          begin
+            p = ::File.expand_path(p)
+            file = File.new(p)
+            file.backup
+            @record.add file
+          rescue => ex
+            die ex.message
+          end
         end
       end
     end
@@ -56,6 +61,11 @@ module Dotbox
       end
     end
 
+    desc :version, 'Display version number'
+    def version
+      puts Dotbox::VERSION::STRING
+    end
+
     def self.source_root
       ::File.dirname(::File.expand_path('../../../bin/dotbox', __FILE__))
     end

data/lib/dotbox/file.rb

@@ -25,22 +25,33 @@ module Dotbox
     end
 
     def backup
+      if ::File.exist?(backup_path)
+        raise "#{@rel_path} has been backuped."
+      end
       FileUtils.mkdir_p ::File.dirname(backup_path)
-      FileUtils.mv @abs_path, backup_path
-      FileUtils.ln_s backup_path, @abs_path
+      FileUtils.mv @abs_path, backup_path, verbose: true
+      FileUtils.ln_s backup_path, @abs_path, verbose: true
     end
 
     def remove
       # must get the backup path first
       backup_path
-      FileUtils.rm @abs_path
-      FileUtils.mv backup_path, @abs_path
+      FileUtils.rm @abs_path, verbose: true
+      FileUtils.mv backup_path, @abs_path, verbose: true
       rm_empty_dir ::File.dirname(backup_path)
     end
 
     def restore
-      FileUtils.mkdir_p ::File.dirname(@abs_path)
-      FileUtils.ln_s backup_path, @abs_path
+      if exist?
+        if link? && link_of?(backup_path)
+          # Dont need restore
+          return
+        else
+          FileUtils.mv @abs_path, "#{@abs_path}.bak", verbose: true
+        end
+      end
+      FileUtils.mkdir_p ::File.dirname(@abs_path), verbose: true
+      FileUtils.ln_s backup_path, @abs_path, verbose: true
     end
 
     def backuped?
@@ -59,5 +70,9 @@ module Dotbox
       @type = directory? ? 'directory' : 'file'
     end
 
+    def exist?
+      ::File.exist?(@abs_path)
+    end
+
   end
 end

data/lib/dotbox/version.rb

@@ -2,7 +2,7 @@ module Dotbox
   module VERSION
     MAJOR = 1
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.');

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dotbox
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Wei Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   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: 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: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Backup your dotfiles to dropbox and restore them easily.
@@ -68,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -90,27 +98,26 @@ files:
 - lib/dotbox/version.rb
 homepage: https://github.com/yesmeck/dotbox
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Backup your dotfiles to dropbox and restore them easily.
 test_files:
 - features/add.feature
@@ -119,4 +126,3 @@ test_files:
 - features/setup.feature
 - features/step_definitions/file_steps.rb
 - features/support/env.rb
-has_rdoc: