mac_setup 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32bfd8387f06a6e39a2fe649c573ada644381af0
-  data.tar.gz: d81c0672a8f3f4ce45b63c3b031e089d5a8ad38c
+  metadata.gz: f57f9af7d99a2694983bf5d0b09a700eae37b249
+  data.tar.gz: 06f8d752ef6a7103c1b829d98a5d0e140dd44739
 SHA512:
-  metadata.gz: c48aca54cefb1d8c2284ecf2e39ae38d30a58784756bed95405077dc38aecd4e6eaf49b514f6e717a50c179cf2919fa620110926d1c83d173fa8fddfaf1e765f
-  data.tar.gz: 8c40807b907e4c2d240edc298bae37187b3e6f9e64724cba6afdf8d2b831309a5fd7acc4022542c0fcf970d59ab7b0d82fcdd92cd450d0d67421c840de9e2049
+  metadata.gz: d5ecd9dd676671ea407cd222aca03577a1fa11c670a62edd600619c77dd171020531d3632b4d1a4465ad6f989a53fc0ab9c67b66e3b50435cee9ed986813a204
+  data.tar.gz: 4110cb066e342f2b4f048b8d6609143cec308eb59789bc04231dc1602cc55a0466540280f87ae315f5d869b0d49652a3bb49ae8c6b3773fda9ad09d8562d14f5

data/exe/mac_setup

@@ -22,4 +22,5 @@ when "encrypt"
   MacSetup.encrypt
 else
   puts "Unknown command: #{command}"
+  puts "Version: #{MacSetup::VERSION}"
 end

data/lib/mac_setup/git_repo_installer.rb

@@ -2,6 +2,8 @@ require_relative "shell"
 
 module MacSetup
   class GitRepoInstaller
+    attr_reader :repo, :install_path, :tracking_key, :status
+
     def self.run(config, _status)
       repos = config.git_repos
       return if repos.none?
@@ -10,39 +12,76 @@ module MacSetup
 
       repos.each do |repo_and_path|
         repo, install_path = repo_and_path.to_a.flatten
-        install_repo(repo, File.expand_path(install_path))
+        new(repo, File.expand_path(install_path)).install_or_update
       end
     end
 
-    def self.install_repo(repo, install_path)
+    def self.install_repo(repo, install_path, tracking_key: nil, status: nil)
+      new(repo, install_path, tracking_key: tracking_key, status: status).install_or_update
+    end
+
+    def initialize(repo, install_path, tracking_key: nil, status: nil)
+      @repo         = repo
+      @install_path = install_path
+      @tracking_key = tracking_key
+      @status       = status
+    end
+
+    def install_or_update
       if Dir.exist?(install_path)
-        MacSetup.log "#{repo} Already Installed. Updating" do
-          update_repo(install_path)
-        end
+        MacSetup.log("#{repo} Already Installed. Updating") { update }
       else
-        MacSetup.log "Installing #{repo}" do
-          url = expand_url(repo)
-          Shell.run(%(git clone --recursive #{url} "#{install_path}"))
-        end
+        MacSetup.log("Installing #{repo}") { install }
       end
     end
 
-    def self.update_repo(install_path)
-      Dir.chdir(install_path) do
-        if can_update?
-          Shell.run("git pull && git submodule update --init --recursive")
-        else
-          puts "\nCan't update. Unstaged changes in #{install_path}"
-          exit 1
-        end
+    private
+
+    def install
+      clone_repo
+      track_install
+    end
+
+    def update
+      unless can_update?
+        puts "\nCan't update. Unstaged changes in #{install_path}"
+        return
+      end
+
+      in_install_path do
+        Shell.run("git fetch")
+        track_update
+        Shell.run("git merge origin && git submodule update --init --recursive")
       end
     end
 
-    def self.can_update?
+    def clone_repo
+      Shell.run(%(git clone --recursive #{repo_url} "#{install_path}"))
+    end
+
+    def can_update?
       Shell.run("git status --porcelain").empty?
     end
 
-    def self.expand_url(repo)
+    def track_install
+      return unless tracking_key
+
+      in_install_path do
+        status.git_changes(tracking_key, Shell.run("git ls-files").split("\n"))
+      end
+    end
+
+    def track_update
+      return unless tracking_key
+
+      status.git_changes(tracking_key, Shell.run("git diff --name-only origin").split("\n"))
+    end
+
+    def in_install_path
+      Dir.chdir(install_path) { yield }
+    end
+
+    def repo_url
       repo =~ %r{^[^/]+/[^/]+$} ? "https://github.com/#{repo}.git" : repo
     end
   end

data/lib/mac_setup/secrets.rb

@@ -1,17 +1,18 @@
 module MacSetup
   class Secrets
+    CRYPTO_LIB = "openssl"
     CIPHER = "aes-256-cbc"
     PLAINTEXT_EXT = "priv"
     CIPHERTEXT_EXT = "crypt"
 
-    attr_reader :dir
+    attr_reader :files, :password
 
-    def self.encrypt(dir)
-      new(dir).encrypt
+    def self.encrypt(dir_or_files)
+      new(filter_files(dir_or_files, PLAINTEXT_EXT)).encrypt
     end
 
-    def self.decrypt(dir)
-      new(dir).decrypt
+    def self.decrypt(dir_or_files)
+      new(filter_files(dir_or_files, CIPHERTEXT_EXT)).decrypt
     end
 
     def self.encrypted?(file)
@@ -24,50 +25,117 @@ module MacSetup
       file.sub(/\.#{PLAINTEXT_EXT}$/, "")
     end
 
-    def initialize(dir)
-      @dir = File.expand_path(dir)
+    def self.filter_files(dir_or_files, extension)
+      if dir_or_files.is_a?(Array)
+        dir_or_files.select { |file| file.to_s.end_with?(extension) }
+      else
+        Dir.glob("#{File.expand_path(dir_or_files)}/**/*.#{extension}")
+      end
+    end
+
+    def initialize(files)
+      @files = files
     end
 
     def encrypt
-      puts "Encrypting files:"
-      files = Dir.glob("#{dir}/**/*.#{PLAINTEXT_EXT}")
-      do_crypt(files, from: PLAINTEXT_EXT, to: CIPHERTEXT_EXT, overwrite: true)
+      do_crypt("encrypt") { encrypt_files }
     end
 
     def decrypt
-      puts "Decrypting files:"
-      files = Dir.glob("#{dir}/**/*.#{CIPHERTEXT_EXT}")
-
-      do_crypt(files, from: CIPHERTEXT_EXT, to: PLAINTEXT_EXT, args: "-d") do |command|
-        unless Shell.success?(command + %W(-in #{files.first}))
-          puts "Wrong password!"
-          exit 1
-        end
+      if files.any?
+        MacSetup.log "Decrypting files:"
+      else
+        MacSetup.log "No files to decrypt. Skipping"
       end
+
+      list_files
+      get_password
+      decrypt_files
     end
 
     private
 
-    def do_crypt(files, options)
-      old_ext = options.fetch(:from)
-      new_ext = options.fetch(:to)
-      overwrite = options.fetch(:overwrite, false)
-      args = Array(options.fetch(:args, []))
+    def do_crypt(type)
+      if files.any?
+        MacSetup.log "#{titleized(type)}ing files:"
+        list_files
+        get_password
+        yield
+      else
+        MacSetup.log "No files to #{type}. Skipping"
+      end
+    end
 
-      files.each { |file| puts " - #{file}" }
-      command = base_command(Shell.password) + args
+    def titleized(str)
+      char, rest = str.split("", 2)
+      char.upcase + rest
+    end
 
-      yield command if block_given?
+    def list_files
+      files.each { |file| puts "  #{MacSetup.shorten_path(file)}" }
+    end
 
+    def get_password
+      @password = Shell.password
+    end
+
+    def encrypt_files
       files.each do |file|
-        target_path = file.sub(/#{old_ext}$/, new_ext)
-        next if !overwrite && File.exist?(target_path)
-        Shell.run(command + %W(-in #{file} -out #{target_path}))
+        target_path = file.sub(/#{PLAINTEXT_EXT}$/, CIPHERTEXT_EXT)
+        do_encrypt(file, target_path)
+      end
+    end
+
+    def decrypt_files
+      if password_correct?
+        do_decrypt
+      else
+        puts "Wrong Password!"
+        get_password
+        decrypt_files
+      end
+    end
+
+    def password_correct?
+      Shell.success?(decrypt_command(files.first, files.first.sub(/#{CIPHERTEXT_EXT}$/, PLAINTEXT_EXT)))
+    end
+
+    def do_decrypt
+      files.each { |file| decrypt_file(file) }
+    end
+
+    def decrypt_file(file, log: true)
+      target_path = file.sub(/#{CIPHERTEXT_EXT}$/, PLAINTEXT_EXT)
+      command = -> { Shell.run(decrypt_command(file, target_path)) }
+
+      if log
+        MacSetup.log "Decrypting #{raw_file_path(file)}", &command
+      else
+        command.call
       end
     end
 
+    def do_encrypt(file, target_path)
+      MacSetup.log "Encrypting #{raw_file_path(file)}" do
+        Shell.run(encrypt_command(file, target_path))
+      end
+    end
+
+    def encrypt_command(file, target_path)
+      %W(openssl enc -aes-256-cbc -k testme -in #{file} -out #{target_path})
+    end
+
+    def decrypt_command(file, target_path)
+      %W(openssl enc -aes-256-cbc -k testme -d -in #{file} -out #{target_path})
+    end
+
     def base_command(password)
-      %W(openssl enc -#{CIPHER} -k #{password})
+      %W(#{CRYPTO_LIB} enc -#{CIPHER} -k #{password})
+    end
+
+    def raw_file_path(file)
+      raw_file = file.sub(/\.#{CIPHERTEXT_EXT}|#{PLAINTEXT_EXT}$/, "")
+      MacSetup.shorten_path(raw_file)
     end
   end
 end

data/lib/mac_setup/secrets_installer.rb

@@ -9,13 +9,12 @@ module MacSetup
     end
 
     def run
-      install_openssl
-      Secrets.decrypt(DOTFILES_PATH)
+      install_crypto
+      Secrets.decrypt(@status.git_changes(:dotfiles))
     end
 
-    def install_openssl
-      # Needed for encrypted files
-      Shell.run("brew install openssl") unless @status.installed_formulas.include?("openssl")
+    def install_crypto
+      Shell.run("brew install #{SECRETS::CRYPTO_LIB}") unless @status.installed_formulas.include?(CRYPTO_LIB)
     end
   end
 end

data/lib/mac_setup/system_status.rb

@@ -2,6 +2,10 @@ require_relative "shell"
 
 module MacSetup
   class SystemStatus
+    def initialize
+      @git_changes = Hash.new { |hash, key| hash[key] = [] }
+    end
+
     def installed_taps
       @installed_taps ||= get_taps
     end
@@ -10,6 +14,14 @@ module MacSetup
       @installed_formulas ||= get_formulas
     end
 
+    def git_changes(key, changes = nil)
+      if changes
+        @git_changes[key] = changes
+      else
+        @git_changes[key]
+      end
+    end
+
     private
 
     def get_taps

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/mac_setup.rb

@@ -27,7 +27,7 @@ module MacSetup
     config = Configuration.new(File.expand_path(config_path))
     status = SystemStatus.new
 
-    GitRepoInstaller.install_repo(config.dotfiles_repo, DOTFILES_PATH)
+    GitRepoInstaller.install_repo(config.dotfiles_repo, DOTFILES_PATH, status: status, track: :dotfiles)
     config.reload!
     INSTALLERS.each { |installer| installer.run(config, status) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler