kiip 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3240b679e955ee5fbd7d1e3a1cd1bd1fe000e20a
-  data.tar.gz: 2ebb7db6c11d52bc7807991b9354455fa87fd80e
+  metadata.gz: da08024c0ea0f33be0d8c9638bdd188bf1790e2d
+  data.tar.gz: 9f04b5a78be8e1504450ee2371f8fbac3d384180
 SHA512:
-  metadata.gz: e8d3d7a910d44edb27f1960d82dff3631b7900c08100b886b96f1c192c98b5633f876bde0ffe2066146c494db6737b268264f6c90ec2a2be27ab0a904a026659
-  data.tar.gz: e701876d02d0ff455ad2423a9ce48dc7d3d6563b83beb4cc6bb69dcf08a3e978ec6715e05ba877d4357fa0c634090267734b96a3efea30f4fc8151bd8623ab85
+  metadata.gz: 794ca532eb4c790f801351877041bc8c8494c2b28f118ad69d97813bc29f85cf03106483fdd3eae2ede993ebdbcfa433394bf6b00422984261aae6c4a1e5d23b
+  data.tar.gz: 75b9890ce3cddc2ed28d91e2893e8eac0e197ded49b16df9c943bd52b8573c6d102a9ca370081d0634752aa8bfecc5c89ade4453a998a497d0be8e9964ce19f6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2
+ruby-2.3

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.3.0
   - 2.2.1
   - 2.1.5
   - 2.0.0

data/README.md

@@ -8,7 +8,8 @@ Kiip, just another dotfiles tool to move your actual files and folders to a repo
 ## Terminology
 
 - `Repository`: the place where your packages are stored, e.g. `~/Dropbox/kiip`
-- `Package`: The file or folder in `PATH_TO_CASTLE/home/PACKAGE_NAME`
+- `Package`: The folder `PATH_TO_REPOSITORY/PACKAGE_NAME`. It can contain multiple entries.
+- `Entry`: The file/folder/symlink **in** `PATH_TO_REPOSITORY/PACKAGE_NAME`. It is the real file/folder, with an base64 encoded name of the original path.
 
 ## Installation
 
@@ -18,19 +19,45 @@ Kiip, just another dotfiles tool to move your actual files and folders to a repo
 
     Commands:
       kiip help [COMMAND]           # Describe available commands or one specific command
-      kiip list                     # lists all packages
-      kiip rm NAME                  # removes package with name NAME, see: kiip help rm
-      kiip sync PACKAGE_NAME        # recreates the source of the package (via symlink, copy, etc)
-      kiip track PACKAGE_NAME PATH  # tracks the file or folder under PATH with the package name NAME....
+      kiip link PACKAGE_NAME        # ensures links to the package files exist
+      kiip list                     # lists all packages with content
+      kiip restore PACKAGE_NAME     # restores the content of the package to the original places
+      kiip rm NAME                  # removes package with name NAME from the repository
+      kiip track PACKAGE_NAME PATH  # tracks the file or folder under PATH with the package name NAM...
+      kiip unlink PACKAGE_NAME      # removes the links to the package files
     
     Options:
-      [--dry], [--no-dry]
+      -d, [--dry], [--no-dry]
+      -v, [--verbose], [--no-verbose]
       
     Examples:
-        kiip track ssh ~/.ssh 
-        kiip list 
+        $ kiip track -v ssh ~/.ssh
+        mv /Users/rowe/.ssh /Users/rowe/Sync/home/kiip/ssh/fi8uc3No
+        ln -s /Users/rowe/Sync/home/kiip/ssh/fi8uc3No /Users/rowe/.ssh
+         
+        $ kiip list 
           ssh:
-            ~/.ssh
+            ~/.ssh | linked
+            
+        $ kiip unlink -v ssh
+        removing ~/.ssh
+        
+        $ kiip list
+            ssh:
+              ~/.ssh | not_existent
+      
+        $ kiip restore -v ssh
+        copy /Users/rowe/Sync/home/kiip/ssh/fi8uc3No to ~/.ssh
+              
+        $ kiip list
+            ssh:
+              ~/.ssh | directory
+              
+        $ kiip rm -v ssh
+        rm -r /Users/rowe/Sync/home/kiip/ssh
+        
+        $ kiip list
+            
         
 
 ## Development

data/exe/kiip

@@ -3,5 +3,10 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'kiip'
-
-Kiip::Cli.start(ARGV)
+begin
+  Kiip::Cli.start(ARGV)
+rescue StandardError => e
+  require 'highline'
+  HighLine.color_scheme = HighLine::SampleColorScheme.new
+  HighLine.new.say "<%= color('#{e.message}', :error) %>"
+end

data/lib/kiip/cli.rb

@@ -1,7 +1,7 @@
 module Kiip
   class Cli < Thor
-    class_option :dry, :type => :boolean, default: false
-    class_option :verbose, :type => :boolean, default: false
+    class_option :dry, :type => :boolean, default: false, aliases: '-d'
+    class_option :verbose, :type => :boolean, default: false, aliases: '-v'
 
     desc 'track PACKAGE_NAME PATH', 'tracks the file or folder under PATH with the package name NAME. wrap PATH in quotes to ensure ~ and env variables are kept.'
     def track package_name, file_or_folder
@@ -33,6 +33,11 @@ module Kiip
       repository.rm package_name
     end
 
+    desc 'version', 'displays kiip version'
+    def version
+      puts Kiip::VERSION
+    end
+
     private
     def repository
       Kiip::Repository.get_instance(is_dry: options[:dry], is_verbose: options[:verbose])

data/lib/kiip/entry.rb

@@ -13,7 +13,8 @@ module Kiip
         cli.agree("#{source} exists. Remove it?") ? remove_source : return
       end
 
-      FileUtils.copy_entry(target, expanded_source, **file_options)
+      puts "copy #{target} to #{source}" if verbose?
+      FileUtils.copy_entry(target, expanded_source) unless dry?
     end
 
     # removes the source. If source is not a link to target, it asks the users.
@@ -24,7 +25,8 @@ module Kiip
       end
 
       if correct_link? or cli.agree("#{source} is not a symlink to #{target}. Still remove it?")
-        FileUtils.remove_entry(expanded_source, **file_options)
+        puts "removing #{source}" if file_options[:verbose]
+        FileUtils.remove_entry(expanded_source, **file_options) unless file_options[:noop]
       end
     end
 
@@ -48,12 +50,20 @@ module Kiip
       @cli || HighLine.new
     end
 
+    def verbose?
+      package.repository.is_verbose
+    end
+
+    def dry?
+      package.repository.is_dry
+    end
+
     def expanded_source
       File.expand_path(source)
     end
 
     def file_options
-      {verbose: package.repository.is_verbose, noop: package.repository.is_dry}
+      {verbose: verbose?, noop: dry?}
     end
 
     # asks the user if source should be removed and removes it

data/lib/kiip/package.rb

@@ -45,14 +45,14 @@ module Kiip
 
       return if repository.is_dry
 
-      task = Tasks::SymlinkTask.new(name: 'task-name', source: tracking_path, target: File.join(path, escaped_tracking_path))
+      task = Tasks::SymlinkTask.new(name: 'task-name', source: tracking_path, target: File.join(path, escaped_tracking_path), is_verbose: repository.is_verbose, is_dry: repository.is_dry)
       task.exec!
     end
 
     def sync!
       content.each do |subpath|
         source = self.class.decode subpath
-        task = Tasks::SymlinkTask.new(name: 'task-name', source: source, target: File.join(path, subpath))
+        task = Tasks::SymlinkTask.new(name: 'task-name', source: source, target: File.join(path, subpath), is_verbose: repository.is_verbose, is_dry: repository.is_dry)
         task.exec!
       end
     end

data/lib/kiip/repository.rb

@@ -7,7 +7,7 @@ module Kiip
     def self.get_instance(**options)
       path = ENV['KIIP_REPO'] || raise('KIIP_REPO environment variable not defined')
 
-      options[:path] = path
+      options[:path] = %x(echo #{path}).rstrip
 
       return self.new(**options)
     end
@@ -110,4 +110,4 @@ module Kiip
       Pathname.new(path).children.select(&:directory?).map(&:basename).map(&:to_s)
     end
   end
-end
+end

data/lib/kiip/tasks/symlink_task.rb

@@ -23,7 +23,10 @@ module Kiip::Tasks
       return initialize! unless File.exists? target
 
       if File.symlink? source
-        return if File.readlink(source) == target
+        if File.readlink(source) == target
+          puts "#{source} already linked" if is_verbose
+          return
+        end
 
         if cli.agree "#{source} already exists, linking to #{File.readlink(source)}. Replace?"
           remove_source

data/lib/kiip/version.rb

@@ -1,3 +1,3 @@
 module Kiip
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kiip
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robin Wenglewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: just another dotfiles tool