crawling 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55d7bcfdfbdab051217b31f045dc643dce1f3606525e5423ac02c8ad948be10
-  data.tar.gz: 52fc3441f5fa0a2290949e7694afc6a3df0f4819f937237345618e42889926a1
+  metadata.gz: f24e27ea229eaf1f3bd1760fefd0b53a759b16aa3354b06f68bc9710d874501a
+  data.tar.gz: eab9333641ee6dcde030089df2970b253f9e514362be54df3a55d6cb3bf71971
 SHA512:
-  metadata.gz: 13b0b1f073279e368e81440f0bd4f5c5d95aa8817a8327f9dc40e1aa53a3131051ee85a3edc2540137bf6e683a0cda5088a079e111af4312dd0a84dbf3772e33
-  data.tar.gz: fca726ff6feba6de569195d8677a470030e30f5d5133a5868d366038dcca49121ebf515c3b06e133416ef55b1753a16ad0a9a69dca31130dbe94b14da86c69fd
+  metadata.gz: 1e9fb2363d3413e29d378f59e507fc9fcca62f1ec6afa385992f88a109fc6334d53ce60c0546c7d02f638a53fe9a5652c0f9744350306cc8da853d4ca1efe09e
+  data.tar.gz: a8c8038e9799dd55287d9c02447a7a327b05e1a5d82296111ac3a7c338e97d693139e6a1643734c9ae4401e196a66a560b245997a26116576f6a9b8f5426534f

data/bin/crawling

@@ -35,7 +35,7 @@ module Crawling::Command
       op.subcommand 'merge,m [*paths]', 'merge differences between store directory and filesystem' do |subop|
         subop.on '-m', '--merge-app app', 'command used to merge files', 'merge_app'
       end
-      op.subcommand 'clone', 'clone or pull latest store using configured commands'
+      op.subcommand 'pull,p', 'pull latest store'
 
       parsed_cfg = op.parse(args)
       command = parsed_cfg.command
@@ -62,8 +62,8 @@ module Crawling::Command
       crawling.diff nil_if_empty(command_cfg.paths)
     when 'merge'
       crawling.merge nil_if_empty(command_cfg.paths)
-    when 'clone'
-      crawling.clone
+    when 'pull'
+      crawling.pull
     end
   rescue RuntimeError => e
     puts e.to_s

data/crawling.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = "crawling"
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4"
 

data/lib/crawling/version.rb

@@ -1,3 +1,3 @@
 module Crawling
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/lib/crawling.rb

@@ -3,12 +3,6 @@ require "diffy"
 require "pathname"
 
 module Crawling
-  # path to repository for user(s)
-  HOME_PARENT_DIR = 'home'
-
-  # path to repository for the system
-  SYSTEM_PARENT_DIR = 'system'
-
   N_LINES_DIFF_CONTEXT = 3
 
   def self.child_files_recursive path
@@ -63,7 +57,10 @@ module Crawling
       @config_pathname = Pathname.new(@config_dir).expand_path
       @merge_app = merge_app || 'nvim -d %s %h'
 
-      stores = { 'home' => @home_dir }
+      stores = {
+        'home' => @home_dir,
+        # 'system' => '/',
+      }
       @stores = stores.map do |store_dir, sys_dir|
         store_dir = File.join(@config_dir, store_dir)
         Store.new store_dir, sys_dir
@@ -71,7 +68,7 @@ module Crawling
     end
 
     def cd
-      FileUtils::mkdir_p @config_dir unless Dir.exists? @config_dir
+      FileUtils.mkdir_p @config_dir unless Dir.exist? @config_dir
       Dir.chdir @config_dir
       puts "creating shell in #{@config_dir}, type exit or ctrl-D to exit"
       system ENV['SHELL']
@@ -82,7 +79,7 @@ module Crawling
       raise "add command requires paths" if paths.empty?
 
       paths.each do |path|
-        raise "path #{path} does not exist" unless File.exists? path
+        raise "path #{path} does not exist" unless File.exist? path
 
         each_with_storage_path(files_from path) do |file, storage_file|
           Crawling.copy_file file, storage_file
@@ -94,7 +91,7 @@ module Crawling
       raise "get command requires paths" if paths.empty?
 
       each_with_storage_path(paths) do |path, storage_path|
-        raise "path #{path} does not exist in storage" unless File.exists? storage_path
+        raise "path #{path} does not exist in storage" unless File.exist? storage_path
 
         files_from(storage_path).each do |storage_file|
           if storage_file == storage_path
@@ -169,8 +166,9 @@ module Crawling
       end
     end
 
-    def clone
-      raise "clone: command not supported yet"
+    def pull
+      Dir.chdir @config_dir
+      system 'git pull'
     end
 
     private
@@ -186,11 +184,17 @@ module Crawling
       end
     end
 
+    # if path is in the store then return it with the system path, if it
+    # is a system path then return it with the store path
     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
+      end
+
+      # path is not in the store
+      @stores.each do |store|
         store_path = store.get_store_path path
         return [ path, store_path ] if store_path
       end
@@ -208,17 +212,17 @@ module Crawling
     end
 
     def files_from path
-      Dir.exists?(path) ? Crawling.child_files_recursive(path) : [path]
+      Dir.exist?(path) ? Crawling.child_files_recursive(path) : [path]
     end
 
     def file_or_storage_file_doesnt_exist file, storage_file
-      if not File.exists? file
-        if File.exists? storage_file
+      if not File.exist? file
+        if File.exist? storage_file
           'system'
         else
           'system directory or store'
         end
-      elsif not File.exists? storage_file
+      elsif not File.exist? storage_file
         'store'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crawling
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - James Pike
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Tool to manage personal configuration and environment files.
 test_files: []