vagrant-trellis-cert 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3308c07a523d858144f4a8e86ef4d1a00f523495
-  data.tar.gz: 3f341bca0087eeaf4ada19da414f68c6d684329a
+  metadata.gz: 9a80cecdab393ada97a1447baafb77d3a170d50e
+  data.tar.gz: 8f08f111c4bc44256828e310ad1e2de232e0c74c
 SHA512:
-  metadata.gz: afb38d993e30a912e5c72f3c887c328142293847249cac0300dbd606d2a3fea656ae807c8b2fa7f9894861ca213029f2dff93fb4d2693a716ec214d35087def4
-  data.tar.gz: 2d2ea0c737ee4305c2c003082494fe83fdae6a0343420989959c57c04fb375045f1a4c2abc2304c53ee48be036cf82e6de3e9f030abfd0978ee5dac9ca7a4ef5
+  metadata.gz: 6bc2665f000b8b0056d7882dede8363cf4d62359cd455ec337a14dd824260f904abc3a8362af9fa259279cc754144db0ee78e35135382f62692bff20b34b19a9
+  data.tar.gz: 9c47bd2770f4f0218cd9f9e601cbc232d68666494cadd3273b570c1c2339230ba57c8dc7f5b665c3c0133ad9c832423d64ff291e43adc411e4f2d6eac8584271

data/.github_changelog_generator

@@ -1,2 +1,2 @@
 unreleased=true
-future-release=v0.3.0
+future-release=v0.4.0

data/.rubocop.yml

@@ -9,7 +9,7 @@ Metrics/LineLength:
   Max: 143
 
 Metrics/MethodLength:
-  Max: 13
+  Max: 11
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v0.4.0](https://github.com/TypistTech/vagrant-trellis-cert/tree/v0.4.0) (2017-10-05)
+[Full Changelog](https://github.com/TypistTech/vagrant-trellis-cert/compare/v0.3.0...v0.4.0)
+
+**Implemented enhancements:**
+
+- Add `distrust` subcommand [\#21](https://github.com/TypistTech/vagrant-trellis-cert/issues/21)
+
+**Merged pull requests:**
+
+- Add `distrust` subcommand [\#37](https://github.com/TypistTech/vagrant-trellis-cert/pull/37) ([TangRufus](https://github.com/TangRufus))
+
 ## [v0.3.0](https://github.com/TypistTech/vagrant-trellis-cert/tree/v0.3.0) (2017-09-18)
 [Full Changelog](https://github.com/TypistTech/vagrant-trellis-cert/compare/v0.2.0...v0.3.0)
 
@@ -10,6 +21,7 @@
 
 **Merged pull requests:**
 
+- Version bump 0.3.0 [\#36](https://github.com/TypistTech/vagrant-trellis-cert/pull/36) ([TangRufus](https://github.com/TangRufus))
 - Determine current VM via `vm-id` as a vagrant plugin should [\#35](https://github.com/TypistTech/vagrant-trellis-cert/pull/35) ([TangRufus](https://github.com/TangRufus))
 - Extract class `Result` [\#34](https://github.com/TypistTech/vagrant-trellis-cert/pull/34) ([TangRufus](https://github.com/TangRufus))
 - Rename module Commands --\> Command [\#33](https://github.com/TypistTech/vagrant-trellis-cert/pull/33) ([TangRufus](https://github.com/TangRufus))

data/README.md

@@ -39,11 +39,13 @@ $ vagrant plugin install vagrant-trellis-cert
 
 ```bash
 Usage: vagrant trellis-cert trust [options] [vm-id]
+Usage: vagrant trellis-cert distrust [options] [vm-id]
 
     -h, --help                       Print this help
 
 # Example: Running within Trellis directory
 $ vagrant trellis-cert trust
+$ vagrant trellis-cert distrust
 
 # Example: Specify VM id
 $ vagrant global-status
@@ -52,6 +54,7 @@ id       name    provider   state    directory
 fb90ab5  default virtualbox running  /Users/me/Code/trellis
 
 $ vagrant trellis-cert trust fb90ab5
+$ vagrant trellis-cert distrust fb90ab5
 ```
 
 ## Going super lazy
@@ -69,6 +72,10 @@ Vagrant.configure('2') do |config|
   config.trigger.after :provision, :stdout => true do
     run "vagrant trellis-cert trust"
   end
+
+  config.trigger.after :destroy, :stdout => true do
+    run "vagrant trellis-cert distrust"
+  end
 end
 ```
 

data/lib/vagrant_plugins/trellis_cert/command/distrust.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'vagrant_plugins/trellis_cert/ssl_config'
+require 'vagrant_plugins/trellis_cert/system'
+
+module VagrantPlugins
+  module TrellisCert
+    module Command
+      class Distrust < Vagrant.plugin('2', :command)
+        def execute
+          _options, argv = parse_options!
+
+          @env.ui.info('Removing certificates...')
+
+          hosts = SSLConfig.new(root_path: machine_root_path(argv))
+                           .canonicals
+          result = System.build
+                         .distrust(hosts)
+
+          result.print(ui: @env.ui)
+
+          result.exit_code
+        end
+
+        private
+
+        def parse_options!
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant trellis-cert distrust [options] [vm-id]'
+            o.separator ''
+
+            o.on('-h', '--help', 'Print this help') do
+              @env.ui.info(opts)
+              exit
+            end
+          end
+          [options, parse_options(opts)]
+        end
+
+        def machine_root_path(argv)
+          with_target_vms(argv) do |machine|
+            return machine.env.root_path
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant_plugins/trellis_cert/command/root.rb

@@ -21,6 +21,11 @@ module VagrantPlugins
             require_relative 'trust'
             Trust
           end
+
+          @subcommands.register(:distrust) do
+            require_relative 'distrust'
+            Distrust
+          end
         end
 
         def execute

data/lib/vagrant_plugins/trellis_cert/command/trust.rb

@@ -10,23 +10,13 @@ module VagrantPlugins
         def execute
           _options, argv = parse_options!
 
-          # To get result variable after mktmpdir block
-          result = nil
+          @env.ui.info('Importing certificates...')
 
-          with_target_vms(argv) do |machine|
-            raise Vagrant::Errors::SSHNotReady unless machine.communicate.ready?
-
-            machine.env.ui.info('Importing certificates...')
-
-            Dir.mktmpdir do |tmp_dir|
-              result = System.build(
-                hosts: SSLConfig.new(root_path: machine.env.root_path).canonicals,
-                tmp_dir: tmp_dir
-              ).trust
-            end
+          hosts = SSLConfig.new(root_path: machine_root_path(argv))
+                           .canonicals
+          result = trust(hosts)
 
-            result.print(ui: machine.env.ui)
-          end
+          result.print(ui: @env.ui)
 
           result.exit_code
         end
@@ -46,6 +36,22 @@ module VagrantPlugins
           end
           [options, parse_options(opts)]
         end
+
+        def machine_root_path(argv)
+          with_target_vms(argv) do |machine|
+            # Machine must be up so that we can download SSL certificates.
+            raise Vagrant::Errors::SSHNotReady unless machine.communicate.ready?
+
+            return machine.env.root_path
+          end
+        end
+
+        def trust(hosts)
+          Dir.mktmpdir do |tmp_dir|
+            return System.build
+                         .trust(hosts: hosts, tmp_dir: tmp_dir)
+          end
+        end
       end
     end
   end

data/lib/vagrant_plugins/trellis_cert/identity.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       end
 
       def self.version
-        '0.3.0'
+        '0.4.0'
       end
 
       def self.description

data/lib/vagrant_plugins/trellis_cert/system.rb

@@ -5,12 +5,12 @@ require 'vagrant_plugins/trellis_cert/system/darwin'
 module VagrantPlugins
   module TrellisCert
     module System
-      def self.build(args)
+      def self.build
         unless Vagrant::Util::Platform.darwin?
           raise 'vagrant-trellis-cert only works on macOS. Pull requests are welcome.'
         end
 
-        Darwin.new(**args)
+        Darwin.new
       end
     end
   end

data/lib/vagrant_plugins/trellis_cert/system/darwin.rb

@@ -8,17 +8,12 @@ module VagrantPlugins
       class Darwin
         KEYCHAIN = '~/Library/Keychains/login.keychain'
 
-        def initialize(hosts:, tmp_dir:)
-          @hosts = hosts
-          @tmp_dir = tmp_dir
-        end
-
-        def trust
+        def trust(hosts:, tmp_dir:)
           Result.new.tap do |result|
-            @hosts.map do |host|
-              cert_path = "#{@tmp_dir}/#{host}.pem"
+            hosts.map do |host|
+              cert_path = "#{tmp_dir}/#{host}.pem"
 
-              # Download certs
+              # Download cert
               system("openssl s_client -showcerts -connect #{host}:443 </dev/null 2>/dev/null | \
               openssl x509 -outform PEM > #{cert_path} 2>/dev/null")
 
@@ -28,6 +23,16 @@ module VagrantPlugins
             end
           end
         end
+
+        def distrust(hosts)
+          Result.new.tap do |result|
+            hosts.map do |host|
+              is_success = system("security delete-certificate -c #{host} #{KEYCHAIN} >/dev/null 2>/dev/null")
+
+              result.add(host: host, is_success: is_success)
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-trellis-cert
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tang Rufus
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-trellis-cert.rb
+- lib/vagrant_plugins/trellis_cert/command/distrust.rb
 - lib/vagrant_plugins/trellis_cert/command/root.rb
 - lib/vagrant_plugins/trellis_cert/command/trust.rb
 - lib/vagrant_plugins/trellis_cert/config.rb