kiip 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edaf299795e1246288dbdaa727437701b4735b3f
-  data.tar.gz: 5484c36987dcf1bf0e0689ead7363711bc4d7eaf
+  metadata.gz: 3240b679e955ee5fbd7d1e3a1cd1bd1fe000e20a
+  data.tar.gz: 2ebb7db6c11d52bc7807991b9354455fa87fd80e
 SHA512:
-  metadata.gz: 854f64eb1af85ba527dbf117b877785a45f70af60eb621bb6723106a076e65f219d926ce58e2016af5a4ef7a37ef77c1f769c9ce01da4320c38283be75715f4f
-  data.tar.gz: af9d9dbb390769891c12aea566ba9250daa91f6b8bd428b3c45545e2445eb3937c6e5f32bbb90b39ae9f1a4f7ac5f03440ea498bbccc86c4ebbe735b6cfb7692
+  metadata.gz: e8d3d7a910d44edb27f1960d82dff3631b7900c08100b886b96f1c192c98b5633f876bde0ffe2066146c494db6737b268264f6c90ec2a2be27ab0a904a026659
+  data.tar.gz: e701876d02d0ff455ad2423a9ce48dc7d3d6563b83beb4cc6bb69dcf08a3e978ec6715e05ba877d4357fa0c634090267734b96a3efea30f4fc8151bd8623ab85

data/lib/kiip/entry.rb

@@ -0,0 +1,64 @@
+module Kiip
+  class Entry < Hashie::Dash
+    property :source, required: true, coerce: String
+    property :target, required: true, coerce: String
+    property :package, required: true
+
+    # restores the entry to it's original place
+    def restore
+      remove_source if correct_link?
+
+      # if file exists, remove or return
+      if File.exist?(expanded_source)
+        cli.agree("#{source} exists. Remove it?") ? remove_source : return
+      end
+
+      FileUtils.copy_entry(target, expanded_source, **file_options)
+    end
+
+    # removes the source. If source is not a link to target, it asks the users.
+    def unlink
+      if not File.exist?(expanded_source)
+        cli.say "#{source} does not exist." if file_options[:verbose]
+        return
+      end
+
+      if correct_link? or cli.agree("#{source} is not a symlink to #{target}. Still remove it?")
+        FileUtils.remove_entry(expanded_source, **file_options)
+      end
+    end
+
+    def status
+      return :linked if correct_link?
+      return :symlink if File.symlink?(expanded_source)
+      return :directory if File.directory?(expanded_source)
+      return :file if File.file?(expanded_source)
+      return :not_existent unless File.exist?(expanded_source)
+
+      raise 'unknown status'
+    end
+
+    private
+
+    def correct_link?
+      File.symlink?(expanded_source) and File.readlink(expanded_source) == target
+    end
+
+    def cli
+      @cli || HighLine.new
+    end
+
+    def expanded_source
+      File.expand_path(source)
+    end
+
+    def file_options
+      {verbose: package.repository.is_verbose, noop: package.repository.is_dry}
+    end
+
+    # asks the user if source should be removed and removes it
+    def remove_source
+      FileUtils.remove_entry(File.expand_path(source), **file_options)
+    end
+  end
+end

data/lib/kiip/package.rb

@@ -0,0 +1,87 @@
+require "base64"
+
+module Kiip
+  class Package < Hashie::Dash
+    class << self
+      def encode path
+        Base64.encode64 path
+      end
+
+      def decode path
+        Base64.decode64 path
+      end
+    end
+
+    include Hashie::Extensions::Dash::Coercion
+    property :name, required: true, coerce: String
+    property :repository, required: true
+
+    def entries
+      content.map do |encoded_original_path|
+        Entry.new(
+            source: self.class.decode(encoded_original_path),
+            target: File.join(path, encoded_original_path),
+            package: self
+        )
+      end
+    end
+
+    def restore
+      entries.each &:restore
+    end
+
+    # removes the links to the package content
+    def unlink
+      entries.each &:unlink
+    end
+
+    def track(tracking_path)
+      raise "path does not exist: #{tracking_path}" unless File.exists?(File.expand_path tracking_path)
+
+      tracking_path = tracking_path.gsub %r{^#{File.expand_path('~')}}, '~'
+
+      # escape /
+      escaped_tracking_path = self.class.encode tracking_path
+
+      return if repository.is_dry
+
+      task = Tasks::SymlinkTask.new(name: 'task-name', source: tracking_path, target: File.join(path, escaped_tracking_path))
+      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.exec!
+      end
+    end
+
+    def decoded_content
+      content.map { |s| self.class.decode s }
+    end
+
+    # creates the package or raises an error
+    def create!
+      Dir.mkdir(path)
+    end
+
+    def rm
+      FileUtils.rm_r(path, verbose: repository.is_verbose, noop: repository.is_dry)
+    end
+
+    # @return [boolean]
+    def exists?
+      File.directory?(path)
+    end
+
+    def path
+      File.join(repository.path, name)
+    end
+
+    # @return [String[]] array of package content files/folders
+    def content
+      Pathname.new(path).children.map(&:basename).map(&:to_s)
+    end
+  end
+end

data/lib/kiip/repository.rb

@@ -2,7 +2,6 @@ require "pathname"
 
 module Kiip
   class Repository < Hashie::Dash
-    autoload :Package, 'kiip/repository/package'
     ID_FILE_NAME = '.kiip_repository'
 
     def self.get_instance(**options)
@@ -24,24 +23,27 @@ module Kiip
     end
 
     def unlink *package_names
+      ensure_existance!
       package_names.each do |name|
         get_package(name).unlink
       end
     end
 
     def restore *package_names
+      ensure_existance!
       package_names.each do |name|
         get_package(name).restore
       end
     end
 
     def sync! *names
+      ensure_existance!
       names = package_names if names.empty?
       names.each { |name| get_package(name).sync! }
     end
 
     def track package_name, path
-      return unless ensure_existance
+      ensure_existance!
       package = get_package(package_name)
       package.create! unless package.exists?
       package.track(path)
@@ -49,26 +51,12 @@ module Kiip
 
     # @return [String] multi-line string with content of the repository
     def print_content
+      ensure_existance!
       StringIO.open do |result|
         packages.each do |package|
           result.puts package.name + ':'
-          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}"
+          package.entries.each do |entry|
+            result.puts "  #{entry.source} | #{entry.status}"
           end
         end
 
@@ -77,6 +65,7 @@ module Kiip
     end
 
     def packages
+      ensure_existance!
       package_names.map do |package_name|
         get_package(package_name)
       end
@@ -88,25 +77,30 @@ module Kiip
     end
 
     def rm *package_names
+      ensure_existance!
       package_names.each do |package_name|
         get_package(package_name).rm
       end
     end
 
     private
+
     # asks user to create repository if it doesn't exist
     #
+    # @raise [IllegalStateError] if the repository doesn't exist
     # @return [boolean] true if repo exists now
-    def ensure_existance
-      return true if exists?
-
-      if HighLine.new.agree("Repository #{path} does not exist. Want me to create it? (yes/no)")
+    def ensure_existance!
+      if not exists? and cli.agree("Repository #{path} does not exist. Want me to create it? (yes/no)")
         create!
       end
 
       exists?
     end
 
+    def cli
+      @cli ||= HighLine.new
+    end
+
     def get_package(package_name)
       Package.new(name: package_name, repository: self)
     end

data/lib/kiip/version.rb

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

data/lib/kiip.rb

@@ -10,6 +10,8 @@ module Kiip
   autoload :Syncer, 'kiip/syncer'
   autoload :Repository, 'kiip/repository'
   autoload :Errors, 'kiip/errors'
+  autoload :Package, 'kiip/package'
+  autoload :Entry, 'kiip/entry'
 
   module Tasks
     autoload :SymlinkTask, 'kiip/tasks/symlink_task'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kiip
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Robin Wenglewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,9 +188,10 @@ files:
 - kiip.gemspec
 - lib/kiip.rb
 - lib/kiip/cli.rb
+- lib/kiip/entry.rb
 - lib/kiip/errors.rb
+- lib/kiip/package.rb
 - lib/kiip/repository.rb
-- lib/kiip/repository/package.rb
 - lib/kiip/tasks/symlink_task.rb
 - lib/kiip/version.rb
 homepage: https://github.com/rweng/kiip

data/lib/kiip/repository/package.rb

@@ -1,89 +0,0 @@
-require "base64"
-
-module Kiip
-  class Repository
-    class Package < Hashie::Dash
-      class << self
-        def encode path
-          Base64.encode64 path
-        end
-
-        def decode path
-          Base64.decode64 path
-        end
-      end
-
-      include Hashie::Extensions::Dash::Coercion
-      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)
-
-        tracking_path = tracking_path.gsub %r{^#{File.expand_path('~')}}, '~'
-
-        # escape /
-        escaped_tracking_path = self.class.encode tracking_path
-
-        return if repository.is_dry
-
-        task = Tasks::SymlinkTask.new(name: 'task-name', source: tracking_path, target: File.join(path, escaped_tracking_path))
-        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.exec!
-        end
-      end
-
-      def decoded_content
-        content.map { |s| self.class.decode s }
-      end
-
-      # creates the package or raises an error
-      def create!
-        Dir.mkdir(path)
-      end
-
-      def rm
-        FileUtils.rm_r(path, verbose: repository.is_verbose, noop: repository.is_dry)
-      end
-
-      # @return [boolean]
-      def exists?
-        File.directory?(path)
-      end
-
-      def path
-        File.join(repository.path, name)
-      end
-
-      # @return [String[]] array of package content files/folders
-      def content
-        Pathname.new(path).children.map(&:basename).map(&:to_s)
-      end
-    end
-  end
-end