vagrant-goodhosts 1.1.0beta → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f6a0225da423c0c803dacaeb97182e8768510d601db33c182a088733d282f60
-  data.tar.gz: f2756ce326a5d766baa4fd63f5d4d158c13fb0591c88a9763dc6e9846b377bbc
+  metadata.gz: d9d571c66bee739daa440ff14420530877b8de9a54772960000c322a621a6dfc
+  data.tar.gz: 1da6af09b2600518c6bc98b46dfd788429408fd43cd22b652cedf699931eca5f
 SHA512:
-  metadata.gz: 11d1c0937d56326ebbd390adc477c8c047b6422f0c81c21ad454d297992876941267102811acbc7e7e32e960a2feb2767d055f086a4461b8f6008cd1b81d0581
-  data.tar.gz: 528d8f7ff5b81d8a377530a628710ef62ae4432790099f3c8a4673c01e2c3d1ef4032181680e63bc5cd49f8925d01374ed3d8ae919a09bd2849ad0def44022d2
+  metadata.gz: f6d3f083e720d58cadeab5a822bbe3eebfcc25adbe1e7bc695b6ad7bb81762d6a2dfe5851ab37580dfcde0bd194d07b78043d5abaa40e64d273d95fc0775b293
+  data.tar.gz: 2094f799367acc58696189954d1691564c7feb3d677fed5edca8ac760e34e819a0dd1313309eb90636b17117ef69c8b05e0195e4bb62c71486ce16cb27c2dc3e

data/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+ruby "~> 2.5.0"
 
 group :development do
   gem "vagrant", git: "https://github.com/hashicorp/vagrant.git"

data/README.md

@@ -24,6 +24,13 @@ To update the plugin:
 vagrant plugin update vagrant-goodhosts
 ```
 
+### Installation from Gem file
+
+The gem file is released with every [release](https://github.com/goodhosts/vagrant/releases) and you can install it with vagrant as it is a plugin after all.  
+Affter downloading the file run this command to install manually:
+
+`vagrant plugin install vagrant-goodhosts-*.gem`
+
 ## Usage
 
 You currently only need the `hostname` and a `:private_network` network with a fixed IP address.
@@ -115,7 +122,7 @@ You have to open an elevated command prompt; hold `❖ Win` and press `X`, then
 
     cacls %SYSTEMROOT%\system32\drivers\etc\hosts /E /G %USERNAME%:W
 
-## Installing The Development Version
+## Generate The Development Version
 
 If you would like to install `vagrant-goodhosts` to make contributions or changes, run the following commands::
 
@@ -125,3 +132,7 @@ cd vagrant-goodhosts
 ./package.sh
 vagrant plugin install vagrant-goodhosts-*.gem
 ```
+
+## Test the plugin
+
+You need to run a Vagrant machine with the minimum settings specified in the [Usage](https://github.com/goodhosts/vagrant#usage) section, it is enough a turn on and off and in the meantime if the hosts file in your machine is written in the right way.

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -48,7 +48,12 @@ module VagrantPlugins
         if OS.windows?
           return 'cli.exe'
         elsif OS.mac?
-          return 'cli_osx'
+          type = system('uname -m')
+          if type == 'x86_64'
+            return 'cli_amd64_osx'
+          else
+            return 'cli_arm64_osx'
+          end
         elsif OS.linux?
           return 'cli'
         else
@@ -104,30 +109,27 @@ module VagrantPlugins
         rescue StandardError => _e
           hostnames_to_add.append(hostname)
         end
-        return hostnames_to_add
+        return hostnames_to_add.join(' ')
       end
 
       def add_goodhost_entries(ip_address, hostnames)
         cli = get_cli
         if cli.include? ".exe"
-          clean = "\"--clean\","
-          if disable_clean(ip_address)
-            clean = ''
-          end
-          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"add\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+          clean = get_clean_parameter_by_system(ip_address, true)
+          command = "Start-Process '#{cli}' -ArgumentList \"add\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs"
+          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", command)
         else
-          clean = "--clean"
-          if disable_clean(ip_address)
-            clean = ''
-          end
-          stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}")
+          clean = get_clean_parameter_by_system(ip_address, false)
+          command = "sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}"
+          stdin, stdout, stderr, wait_thr = Open3.popen3(command)
         end
-        return stdin, stdout, stderr, wait_thr
+        return stdin, stdout, stderr, wait_thr, command
       end
 
       def add_host_entries
         error = false
-        error_text = ""
+        error_text = ''
+        command = ''
         hostnames_by_ips = generate_hostnames_by_ips
 
         return if hostnames_by_ips.none?
@@ -142,34 +144,35 @@ module VagrantPlugins
 
           # filter out the hosts we've already added
           hosts_to_add = check_hostnames_to_add(ip_address, hostnames)
-          next if hosts_to_add.none?
+          next if hosts_to_add.empty?
 
-          _stdin, _stdout, stderr, wait_thr = add_goodhost_entries(ip_address, hosts_to_add)
+          _stdin, _stdout, stderr, wait_thr, command = add_goodhost_entries(ip_address, hosts_to_add)
           unless wait_thr.value.success?
             error = true
             error_text = stderr.read.strip
           end
         end
-        print_readme(error, error_text)
+        print_readme(error, error_text, command)
       end
 
       def remove_goodhost_entries(ip_address, hostnames)
         cli = get_cli
-        clean = "\"--clean\","
-        if disable_clean(ip_address)
-          clean = ''
-        end
         if cli.include? ".exe"
-          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"remove\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+          clean = get_clean_parameter_by_system(ip_address, true)
+          command = "Start-Process '#{cli}' -ArgumentList \"remove\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs"
+          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", command)
         else
-          stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}")
+          clean = get_clean_parameter_by_system(ip_address, false)
+          command = "sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}"
+          stdin, stdout, stderr, wait_thr = Open3.popen3(command)
         end
-        return stdin, stdout, stderr, wait_thr
+        return stdin, stdout, stderr, wait_thr, command
       end
 
       def remove_host_entries
         error = false
-        error_text = ""
+        error_text = ''
+        command = ''
         hostnames_by_ips = generate_hostnames_by_ips
 
         return if hostnames_by_ips.none?
@@ -182,22 +185,36 @@ module VagrantPlugins
             next
           end
 
-          _stdin, _stdout, stderr, wait_thr = remove_goodhost_entries(ip_address, hostnames)
+          _stdin, _stdout, stderr, wait_thr, command = remove_goodhost_entries(ip_address, hostnames)
           unless wait_thr.value.success?
             error = true
             error_text = stderr.read.strip
           end
         end
-        print_readme(error, error_text)
+        print_readme(error, error_text, command)
+      end
+
+      def get_clean_parameter_by_system(ip_address, is_win)
+        clean = "--clean"
+        if is_win
+          clean = "\"--clean\","
+        end
+
+        if disable_clean(ip_address)
+          clean = ''
+        end
+        return clean
       end
 
-      def print_readme(error, error_text)
+      def print_readme(error, error_text, command)
         unless error
+          @ui.info "[vagrant-goodhosts] Finished processing"
           return false
         end
 
         cli = get_cli
         @ui.error "[vagrant-goodhosts] Issue executing goodhosts CLI: #{error_text}"
+        @ui.error "[vagrant-goodhosts] Command: #{command}"
         @ui.error "[vagrant-goodhosts] Cli path: #{cli}"
         if cli.include? ".exe"
           @ui.error "[vagrant-goodhosts] Check the readme at https://github.com/goodhosts/vagrant#windows-uac-prompt"
@@ -207,6 +224,18 @@ module VagrantPlugins
         end
       end
 
+      def append_hostsnames_by_ips(hostnames_by_ips, hostnames, ip_address, ip_index)
+        if hostnames[ip_index].count() > 0
+          hostnames[ip_index].each do |hostname|
+            unless ip_address.nil?
+              @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
+            end
+          end
+          hostnames_by_ips = { ip_address => hostnames[ip_index].join(" ") }
+        end
+        return hostnames_by_ips
+      end
+
       def generate_hostnames_by_ips
         hostnames_by_ips = []
         ips = get_ips
@@ -218,25 +247,11 @@ module VagrantPlugins
         if ips.count() > 1
           ips.each do |ip|
             ip_address = ip
-            if hostnames[ip].count() > 0
-              hostnames[ip].each do |hostname|
-                unless ip_address.nil?
-                  @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
-                end
-              end
-              hostnames_by_ips = { ip_address => hostnames[ip].join(" ") }
-            end
+            hostnames_by_ips = append_hostsnames_by_ips(hostnames_by_ips, hostnames, ip_address, ip)
           end
         else
           ip_address = ips[0]
-          if hostnames[ip_address].count() > 0
-            hostnames[ip_address].each do |hostname|
-              unless ip_address.nil?
-                @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
-              end
-            end
-            hostnames_by_ips = { ip_address => hostnames[ip_address].join(" ") }
-          end
+          hostnames_by_ips = append_hostsnames_by_ips(hostnames_by_ips, hostnames, ip_address, ip_address)
         end
 
         return hostnames_by_ips

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.1.0beta'
+    VERSION = '1.1.2'
   end
 end

data/package.sh

@@ -5,9 +5,10 @@ cd ./lib/vagrant-goodhosts/bundle
 # Download
 curl -s https://api.github.com/repos/goodhosts/cli/releases/latest | jq --raw-output '.assets[] | .browser_download_url' | xargs wget -i
 # Extract
-tar -zxvf goodhosts_darwin_amd64.tar.gz goodhosts && mv goodhosts cli_osx
-tar -zxvf goodhosts_linux_amd64.tar.gz goodhosts && mv goodhosts cli
-tar -zxvf goodhosts_windows_amd64.tar.gz goodhosts.exe && mv goodhosts.exe cli.exe
+tar -zxvf goodhosts-1.1.0-darwin-amd64.tar.gz goodhosts && mv goodhosts cli_amd64_osx
+tar -zxvf goodhosts-1.1.0-darwin-arm64.tar.gz goodhosts && mv goodhosts cli_arm64_osx
+tar -zxvf goodhosts-1.1.0-linux-amd64.tar.gz goodhosts && mv goodhosts cli
+tar -zxvf goodhosts-1.1.0-windows-amd64.tar.gz goodhosts.exe && mv goodhosts.exe cli.exe
 rm -f ./*.tar.gz
 rm -f ./*.txt
 # Generate

data/vagrant-goodhosts.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
   s.name          = 'vagrant-goodhosts'
   s.version       = VagrantPlugins::GoodHosts::VERSION
   s.platform      = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 2.5'
   s.authors       = ['Daniele Scasciafratte']
   s.email         = ['mte90net@gmail.com']
   s.description   = "Enables Vagrant to update hosts file on the host machine with goodhosts"
@@ -19,7 +20,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'bundler', '>= 2.2.10'
   s.add_development_dependency 'rake'
 
   s.add_runtime_dependency "os"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.1.0beta
+  version: 1.1.2
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,8 @@ files:
 - lib/vagrant-goodhosts/GoodHosts.rb
 - lib/vagrant-goodhosts/bundle/cli
 - lib/vagrant-goodhosts/bundle/cli.exe
-- lib/vagrant-goodhosts/bundle/cli_osx
+- lib/vagrant-goodhosts/bundle/cli_amd64_osx
+- lib/vagrant-goodhosts/bundle/cli_arm64_osx
 - lib/vagrant-goodhosts/config.rb
 - lib/vagrant-goodhosts/plugin.rb
 - lib/vagrant-goodhosts/version.rb
@@ -91,12 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.27
 signing_key: