kiip 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e5818f0a0325b3bcf27992b9625999ee7fd84b
-  data.tar.gz: 680475d12c6fff02f03712998dd18f3737c31d64
+  metadata.gz: edaf299795e1246288dbdaa727437701b4735b3f
+  data.tar.gz: 5484c36987dcf1bf0e0689ead7363711bc4d7eaf
 SHA512:
-  metadata.gz: ff4a62f82c33481ac4b599aff38ca7b820190dad8fd48ee6b09b9f6cf103189a0066973c06d06806767c4d5ad60d02b02f8481dbac92abd8199e7d9a51f73b67
-  data.tar.gz: 510ff324195741f64c08702b83495fa2af27bd02d584e457b5168975695a331a42a38fb9bef0b7a2b3800c1f2417572304866bc017e058aec314eb3b961f793c
+  metadata.gz: 854f64eb1af85ba527dbf117b877785a45f70af60eb621bb6723106a076e65f219d926ce58e2016af5a4ef7a37ef77c1f769c9ce01da4320c38283be75715f4f
+  data.tar.gz: af9d9dbb390769891c12aea566ba9250daa91f6b8bd428b3c45545e2445eb3937c6e5f32bbb90b39ae9f1a4f7ac5f03440ea498bbccc86c4ebbe735b6cfb7692

data/lib/kiip/cli.rb

@@ -8,20 +8,27 @@ module Kiip
       repository.track(package_name, file_or_folder)
     end
 
-    desc 'sync PACKAGE_NAME', 'recreates the source of the package (via symlink, copy, etc)'
-    def sync package_name
+    desc 'link PACKAGE_NAME', 'ensures links to the package files exist'
+    def link package_name
       repository.sync!(package_name)
     end
 
-    desc 'list', 'lists all packages'
+    desc 'unlink PACKAGE_NAME', 'removes the links to the package files'
+    def unlink package_name
+      repository.unlink(package_name)
+    end
+
+    desc 'restore PACKAGE_NAME', 'restores the content of the package to the original places'
+    def restore package_name
+      repository.restore package_name
+    end
+
+    desc 'list', 'lists all packages with content'
     def list
       puts repository.print_content
     end
 
-    option :remove_source, default: false, type: :boolean, desc: 'if the source should be removed, defaults to false'
-    option :remove_target, default: false, type: :boolean, desc: 'if the source should be removed, defaults to false'
-    option :replace_source, default: false, type: :boolean, desc: 'if the source should be replaced with the target, defaults to false'
-    desc 'rm NAME', 'removes package with name NAME, see: kiip help rm'
+    desc 'rm NAME', 'removes package with name NAME from the repository'
     def rm package_name
       repository.rm package_name
     end

data/lib/kiip/repository.rb

@@ -23,6 +23,18 @@ module Kiip
       File.exists? id_file_path
     end
 
+    def unlink *package_names
+      package_names.each do |name|
+        get_package(name).unlink
+      end
+    end
+
+    def restore *package_names
+      package_names.each do |name|
+        get_package(name).restore
+      end
+    end
+
     def sync! *names
       names = package_names if names.empty?
       names.each { |name| get_package(name).sync! }
@@ -40,7 +52,24 @@ module Kiip
       StringIO.open do |result|
         packages.each do |package|
           result.puts package.name + ':'
-          package.decoded_content.each { |content| result.puts '  ' + content }
+          package.content.each do |content|
+            decoded_path_original = Kiip::Repository::Package.decode(content)
+            decoded_path_expanded = File.expand_path decoded_path_original
+
+            if File.symlink?(decoded_path_expanded)
+              status = File.readlink(decoded_path_expanded) == File.join(package.path, content) ? 'linked' : 'symlink'
+            elsif File.directory?(decoded_path_expanded)
+              status = 'directory'
+            elsif File.file? decoded_path_expanded
+              status = 'file'
+            elsif not File.exist? decoded_path_expanded
+              status = 'not existant'
+            else
+              raise 'unknown status'
+            end
+
+            result.puts "  #{decoded_path_original} | #{status}"
+          end
         end
 
         result.string

data/lib/kiip/repository/package.rb

@@ -17,6 +17,24 @@ module Kiip
       property :name, required: true, coerce: String
       property :repository, required: true
 
+      def restore
+        unlink
+        content.each do |encoded_orginal_path|
+          decoded_original_path = self.class.decode encoded_orginal_path
+          FileUtils.cp_r(File.join(path, encoded_orginal_path), decoded_original_path,
+                         verbose: repository.is_verbose, noop: repository.is_dry)
+        end
+      end
+
+      # removes the links to the package content
+      def unlink
+        content.each do |encoded_orginal_path|
+          decoded_original_path = self.class.decode encoded_orginal_path
+          if File.symlink?(decoded_original_path) and File.readlink(decoded_original_path) == File.join(path, encoded_orginal_path)
+            FileUtils.rm decoded_original_path
+          end
+        end
+      end
 
       def track(tracking_path)
         raise "path does not exist: #{tracking_path}" unless File.exists?(File.expand_path tracking_path)
@@ -50,11 +68,7 @@ module Kiip
       end
 
       def rm
-        content.each do |subpath|
-          source = self.class.decode subpath
-          task = Tasks::SymlinkTask.new(name: 'task-name', source: source, target: File.join(path, subpath))
-          task.restore
-        end
+        FileUtils.rm_r(path, verbose: repository.is_verbose, noop: repository.is_dry)
       end
 
       # @return [boolean]
@@ -66,7 +80,6 @@ module Kiip
         File.join(repository.path, name)
       end
 
-      private
       # @return [String[]] array of package content files/folders
       def content
         Pathname.new(path).children.map(&:basename).map(&:to_s)

data/lib/kiip/tasks/symlink_task.rb

@@ -21,6 +21,7 @@ module Kiip::Tasks
     # actually execute the task
     def exec!
       return initialize! unless File.exists? target
+
       if File.symlink? source
         return if File.readlink(source) == target
 
@@ -38,19 +39,15 @@ module Kiip::Tasks
       end
     end
 
-    def restore
-      remove_source
-      copy_target_to_source
-    end
-
     private
+
     def cli
       HighLine.new
     end
 
     def initialize!
       raise "source must exist to initalize: #{source}" unless File.exists? source
-      raise "source must not be a symlink: #{source}" if File.symlink? source
+      return if File.symlink?(source) and not cli.agree("source is a symlink: #{source}. Continue?")
 
       move_source_to_target
       create_symlink_from_source_to_target
@@ -61,10 +58,7 @@ module Kiip::Tasks
     end
 
     def remove_source
-      # only force on real directories
-      do_force = !File.symlink?(source) and File.directory?(source)
-
-      FileUtils.rm(source, verbose: is_verbose, noop: is_dry, force: do_force)
+      FileUtils.rm_r(source, verbose: is_verbose, noop: is_dry)
     end
 
     def move_source_to_target

data/lib/kiip/version.rb

@@ -1,3 +1,3 @@
 module Kiip
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kiip
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robin Wenglewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: just another dotfiles tool