crawling 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16535e151189a5b08dd80f2ee96eb80c773c4c89
-  data.tar.gz: 546fb69bf2ce963cf18f151bd3d1a10888e93b2f
+  metadata.gz: 58b06f8d2ecfcaf9426d38d525f90e0385db30f0
+  data.tar.gz: e03d6cac9a48affb12ef7f3dc0b327c914960686
 SHA512:
-  metadata.gz: a5012d5fdc91a4d57a648267651cf8d5f7c3f53db251207ed1539f227be611e293e35adec77cf1c3b04ee1dc3329e65bdd8b074953366ba67e6fec05952360ec
-  data.tar.gz: f95a2b676c9c37f872ea452cda34e665e84a9b39fc7aec3d00582a9da5996dafff4cc64b09e115b462f9b2c9c684873fd71ec33ee2abd2f72a5c4c721688f891
+  metadata.gz: 60a167da46d0fb9bad4f679062328f1c8a49da7908bfda35b9312aa9df2f1887a31c39f374a8cb050c540d706b94d07d790a5aa3ee0d429775b5a68dcbd153b5
+  data.tar.gz: d0d95bb35f2be14eca28ccdd2611b85c3cceb605860f885a11ca08fc3e6e1aeedcc6f15b058138951cb289bfce1104beefe0cae8b754da813022e5164515badb

data/bin/crawling

@@ -6,6 +6,10 @@ require 'moister'
 require 'ostruct'
 
 module Crawling::Command
+  def self.nil_if_empty arr
+    arr.empty? ? nil : arr
+  end
+
   def self.run args
     config = nil
     command = nil
@@ -25,16 +29,15 @@ module Crawling::Command
       op.on '-H', '--home dir', 'path to home directory', 'home_dir'
 
       op.subcommand 'cd', 'run shell in store directory'
-      op.subcommand 'add', 'add files to store directory'
-      op.subcommand 'get', 'get files from store directory'
-      op.subcommand 'diff', 'show differences between store directory and filesystem'
-      op.subcommand 'merge', 'merge differences between store directory and filesystem' do |subop|
+      op.subcommand 'add,a *paths', 'add paths to store directory'
+      op.subcommand 'get,g *paths', 'get paths from store directory'
+      op.subcommand 'diff,d [*paths]', 'show differences between store directory and filesystem'
+      op.subcommand 'merge,m [*paths]', 'merge differences between store directory and filesystem' do |subop|
         op.on '-m', '--merge-app app', 'command used to merge files', 'merge_app'
       end
       op.subcommand 'clone', 'clone or pull latest store using configured commands'
 
       parsed_cfg = op.parse(args)
-      positionals = parsed_cfg.positionals
       command = parsed_cfg.command
       config = OpenStruct.new parsed_cfg[:config]
     end
@@ -44,18 +47,21 @@ module Crawling::Command
       exit
     end
 
+    command_cfg = OpenStruct.new config[command]
+    config.delete_field command
+
     crawling = Crawling::Instance.new(**config.to_h)
     case command
     when 'cd'
-      crawling.cd positionals[0]
+      crawling.cd
     when 'add'
-      crawling.add positionals
+      crawling.add command_cfg.paths
     when 'get'
-      crawling.get positionals
+      crawling.get command_cfg.paths
     when 'diff'
-      crawling.diff positionals
+      crawling.diff nil_if_empty(command_cfg.paths)
     when 'merge'
-      crawling.merge positionals
+      crawling.merge nil_if_empty(command_cfg.paths)
     when 'clone'
       crawling.clone
     end

data/crawling.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency "moister", "~> 0.2"
+  spec.add_dependency "moister", "~> 0.3"
   spec.add_dependency "diffy", "~> 3.1.0"
 end

data/lib/crawling/version.rb

@@ -1,3 +1,3 @@
 module Crawling
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/crawling.rb

@@ -15,6 +15,11 @@ module Crawling
     Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject(&File.method(:directory?))
   end
 
+  # relative_to must be an absolute Pathname
+  def self.relative_path_to target, relative_to
+    Pathname.new(target).expand_path.relative_path_from relative_to
+  end
+
   # Like File.cp but also creates the parent directory at destination if it doesn't exist
   def self.copy_file src_file, dest_file
     dest_parent_dir = File.dirname dest_file
@@ -26,22 +31,49 @@ module Crawling
     end
   end
 
+  class Store
+    attr_reader :store_dir
+
+    def initialize store_dir, sys_dir
+      @store_dir = File.absolute_path store_dir
+      @store_pathname = Pathname.new(store_dir).expand_path
+      @sys_dir = File.absolute_path sys_dir
+      @sys_pathname = Pathname.new(sys_dir).expand_path
+    end
+
+    # if path is within store then return system path otherwise return nil
+    def get_sys_path path
+      if path.start_with? @store_dir
+        File.join @sys_dir, Crawling.relative_path_to(path, @store_pathname)
+      end
+    end
+
+    # if path is within system then return store path otherwise return nil
+    def get_store_path path
+      if path.start_with? @sys_dir
+        File.join @store_dir, Crawling.relative_path_to(path, @sys_pathname)
+      end
+    end
+  end
+
   class Instance
     def initialize(config_dir: nil, home_dir: nil, merge_app: nil)
       @home_dir = home_dir || ENV['HOME']
-      @home_pathname = Pathname.new(@home_dir).expand_path
       @config_dir = config_dir || "#{@home_dir}/.config/crawling"
       @config_pathname = Pathname.new(@config_dir).expand_path
       @merge_app = merge_app || 'vimdiff %s %h'
-    end
 
-    def cd(subdir = nil)
-      cd_dir = get_config_dir
-      cd_dir = Path.join(cd_dir, subdir) if subdir
-      raise "directory #{subdir} doesn't exist" unless Dir.exists? cd_dir
+      stores = { 'home' => @home_dir }
+      @stores = stores.map do |store_dir, sys_dir|
+        store_dir = File.join(@config_dir, store_dir)
+        Store.new store_dir, sys_dir
+      end
+    end
 
-      Dir.chdir cd_dir
-      puts "creating shell in #{cd_dir}, type exit or ctrl-D to exit"
+    def cd
+      FileUtils::mkdir_p @config_dir unless Dir.exists? @config_dir
+      Dir.chdir @config_dir
+      puts "creating shell in #{@config_dir}, type exit or ctrl-D to exit"
       system ENV['SHELL']
       puts "crawling shell exited"
     end
@@ -65,13 +97,18 @@ module Crawling
         raise "path #{path} does not exist in storage" unless File.exists? storage_path
 
         files_from(storage_path).each do |storage_file|
-          sys_path = from_storage_path storage_file
-          Crawling.copy_file storage_file, sys_path
+          if storage_file == storage_path
+            Crawling.copy_file storage_file, path
+          else
+            # path was a directory so recalculate new system path
+            path_offset = storage_file[storage_path.length..-1]
+            Crawling.copy_file storage_file, path + path_offset
+          end
         end
       end
     end
 
-    def diff paths
+    def diff paths = nil
       each_with_storage_path(files_from_paths_or_all paths) do |file, storage_file|
         missing_from = file_or_storage_file_doesnt_exist file, storage_file
         if missing_from
@@ -88,7 +125,7 @@ module Crawling
       end
     end
 
-    def merge paths
+    def merge paths = nil
       each_with_storage_path(files_from_paths_or_all paths) do |file, storage_file|
         missing_from = file_or_storage_file_doesnt_exist file, storage_file
         if missing_from
@@ -138,47 +175,33 @@ module Crawling
 
     private
     def get_config_dir
-      FileUtils::mkdir_p @config_dir unless Dir.exists? @config_dir
       @config_dir
     end
 
-    def relative_path_to target, relative_to
-      Pathname.new(target).expand_path.relative_path_from relative_to
-    end
-
     def each_with_storage_path paths
       paths.each do |path|
-        yield path, get_storage_path(path)
+        pair = get_path_pair(path)
+        raise "could not resolve #{path} to store" if pair.nil?
+        yield pair
       end
     end
 
-    def get_home_path path
-      relative_path_to path, @home_pathname
-    end
-
-    def get_storage_path path
-      # TODO: get system or home path depending on whether it is a subdirectory of the current user
-      File.join @config_dir, HOME_PARENT_DIR, get_home_path(path)
-    end
-
-    def from_storage_path path
-      cfg_rel_path = Pathname.new(relative_path_to path, @config_pathname)
-      head, *tail = Pathname(cfg_rel_path).each_filename.to_a
-      if head === 'home'
-        File.join @home_dir, *tail
-      else
-        raise "storage type #{head} not supported yet"
+    def get_path_pair path
+      path = File.absolute_path path
+      @stores.each do |store|
+        sys_path = store.get_sys_path path
+        return [ sys_path, path ] if sys_path
+        store_path = store.get_store_path path
+        return [ path, store_path ] if store_path
       end
+      nil
     end
 
-    # if paths is empty then get home paths for all paths in storage, else get the
-    # files recursively reachable from the provided paths
+    # if paths is empty then get all paths from stores otherwise get files
+    # recursively reachable from the provided paths
     def files_from_paths_or_all paths
-      if paths.empty?
-        # TODO: also support 'SYSTEM_PARENT_DIR'
-        Crawling.child_files_recursive(
-          File.join(@config_dir, HOME_PARENT_DIR)
-        ).map &method(:from_storage_path)
+      if paths.nil?
+        @stores.map { |store| Crawling.child_files_recursive(store.store_dir) }.flatten
       else
         paths.map(&method(:files_from)).flatten
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crawling
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement