kubs_cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b830afd146bee9f410b320f4cf6f75163b63e35b5e2064f86e1f5c0cb00e945c
-  data.tar.gz: 1b9e912e6f4df7dacf031a71c53fda417443e992ec4578d41f2a520ed57e9277
+  metadata.gz: 41dcb18c2b577d0639f0a2ab27356984c2ecc949c5c0362a86c34323b5b0f84d
+  data.tar.gz: 20f30d98f7df0c3f226f682b5a0b53262a4333ac6cda36157a3f961b51607cca
 SHA512:
-  metadata.gz: 278b9b1b67ade728b66723bbf03d409491b864d27e92e710509f030e1ad74f39b0533a4d2640fb92082be3ed093d4c2cfede60c16e647485734bf0cd53e8aa35
-  data.tar.gz: c31824845a69c4683576d74273c0c5b9179e53c1a454a13a2a061e4f7de3d1d2080da9fc9ceb4685171d96e2558e75647a2493285222faa4bf9e9e4b9ee441a3
+  metadata.gz: 3f9edf7674ad0ca2348c62bafac11911b3db109fb4da42ad08f1c50fb75e09bfe8eb616d085216551ce01e5c8f0c9413c6bb6f0881eca99086ead98a8d702c48
+  data.tar.gz: c054130c01c46ae3b331f0eb52486b7d415fa25add7793c32f14a5c5f362f597ccb53b95748435ad885bcfc149137333d358938ec08aa350c07362ece078c3af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kubs_cli (0.1.6)
+    kubs_cli (0.1.7)
       rake (~> 10.0)
       thor (~> 0.20)
 

data/lib/kubs_cli/pull.rb

@@ -19,45 +19,44 @@ module KubsCLI
 
     # Pulls dotfiles into your dotfiles inside your repo
     def pull_dotfiles
-      local = @config.local_dir
-      remote = @config.dotfiles
-      same_files(local: local, remote: remote).each do |ary|
-        # local
-        l = ary[0]
-        # remote
-        r = ary[1]
-
-        unless File.directory?(local) || File.directory?(remote)
-          @fh.copy(from: l, to: r)
-          next
-        end
-
-        same_files(local: l, remote: r, remote_prefix: '').each do |nested_ary|
-          nested_local = nested_ary[0]
-          nested_remote = nested_ary[1]
+      dotfiles = @config.dotfiles
+      local_dir = @config.local_dir
 
-          @fh.copy(from: nested_local, to: nested_remote)
-        end
+      shared_dotfiles(dotfiles, local_dir) do |remote, local|
+        copy_files(local, remote)
       end
     end
 
-    def same_files(local:, remote:, remote_prefix: '.')
-      ary = []
+    def copy_files(orig_file, new_file)
+      unless File.directory?(orig_file) || File.directory?(new_file)
+        return @fh.copy(from: orig_file, to: new_file)
+      end
+
+      Dir.each_child(orig_file) do |o_file|
+        Dir.each_child(new_file) do |n_file|
+          next unless o_file == n_file
 
-      Dir.each_child(local) do |l_file|
-        Dir.each_child(remote) do |r_file|
-          next if l_file != "#{remote_prefix}#{r_file}"
+          o_file = File.join(File.expand_path(orig_file), o_file)
+          n_file = File.expand_path(new_file)
 
-          ary << [l_file, r_file]
+          @fh.copy(from: o_file, to: n_file)
         end
       end
-      ary
     end
 
-    def files_only(directory)
-      Dir["#{directory}/**/*"].reject { |f| File.directory?(f) }
+    def shared_dotfiles(dotfiles, local_dir)
+      Dir.each_child(dotfiles) do |remote_file|
+        Dir.each_child(local_dir) do |local_file|
+          next unless local_file == ".#{remote_file}"
+
+          remote_file = File.join(dotfiles, remote_file)
+          local_file = File.join(local_dir, local_file)
+          yield(remote_file, local_file)
+        end
+      end
     end
 
+
     # Pulls gnome_terminal_settings into your dotfiles inside your repo
     def pull_gnome_terminal_settings
       # This is where dconf stores gnome terminal

data/lib/kubs_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KubsCLI
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubs_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - paramagicdev