landrush-ip 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTRkYWM4YjI0NmRlYzhhNTE0NjU1NmZlZDM0ODM5NGIxMDFlYTIyYQ==
-  data.tar.gz: !binary |-
-    YjJkYzdhNTJiZTgxNmQxZjg0NjcxOGUwYTJmN2ExMzYyM2Y5Y2I5ZQ==
+SHA1:
+  metadata.gz: 09eecec1535f102c4f647f8e27ef4fc8982b07cf
+  data.tar.gz: 5c774918db94ea510b72faaa92e0fa333c4f959d
 SHA512:
-  metadata.gz: !binary |-
-    MzIyNGUyZmUwMDJiMTQ2YTliMDE1YmQyOTJlZjBjOGUyMGI5YzNlZDVkNWQ0
-    MDgyMDE3NGI0ZjQwMWQ3ODZlNTFhZmNkOTM3NmY1YTAzMGM1ZWFmN2NiNGJj
-    MDMwYzYyNzQzNWY3Nzk3ZDdlZmRhMGVkZWMyMjAyZDkwODkxYTU=
-  data.tar.gz: !binary |-
-    NTVlZjRmMmU4YWVlZTE3NTg4OTZmZjE1YjBhY2I1YjhkMDMyOGUxMTI0ZGMz
-    YzVjZWE4ODE0YzhiMmE0ZDk0ODRhYmEzMzQzMzM1M2NmZjRjNWMzZjQ0ZDY1
-    YmU0ZDhmMDFkZDYwMTU1YmY3MTM5MTA2NTdhZDQxYTdjZjFiODI=
+  metadata.gz: d442da212d812e505075f4bca308d8492a6a1afa2a3d8ccdd51b13d8b183a98baf86bdec0dccb00aff6ac8fd86af8ec880895efa7db5d270efcf3a3b881948f9
+  data.tar.gz: 098c4845fe272f88325aab306df9b939d8d3e5f93eaef48d932cc6f9768c75d91b1167a0e01839fa1c9ddca8a2128549218125db5bbc4d364deb26ebea0252f3

data/README.md

@@ -1,6 +1,6 @@
 # LandrushIp
 
-[![Build Status](https://travis-ci.org/Werelds/landrush-ip.svg?branch=master)](https://travis-ci.org/Werelds/landrush-ip)
+[![Build Status](https://travis-ci.org/vagrant-landrush/landrush-ip.svg?branch=master)](https://travis-ci.org/vagrant-landrush/landrush-ip)
 
 This gem is a capability plugin for Vagrant, used in Landrush (but perfectly usable outside Landrush).
 
@@ -20,9 +20,7 @@ Once we're happy with the functionality and mechanics, this will be expanded to
 
 ## Usage
 
-When used with Landrush, it will automatically be activated and install itself.
-
-Without Landrush, one has to enable it explicitly via `landrush_ip.override` if auto-installation is desired.
+When `landrush_ip_get` is called, the necessary binary will automatically be installed. Alternatively, one can explicitly force automatic installation `landrush_ip.auto_install` if desired.
 
 Other plugins can use the provided capabilities to check if it is installed and/or install it.
 
@@ -73,7 +71,7 @@ By default, it returns the output in TSV (Tab Separated Values) format.
 The JSON and YAML formats output objects and hashes respectively, that have a `name`, `ipv4` and `ipv6` key.
 
 No filtering is done with any of the formats, so any interface that has no assigned IP will still show up.
- It's left up to consumer to filter that out.
+ It's left up to consumers to filter that out.
  Same goes for the order in which they are returned, they are returned as returned by the OS.
  
 The following examples are all from OS X (Darwin)
@@ -152,7 +150,7 @@ A `Vagrantfile` is present to run the plugin in if you so desire.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/Werelds/landrush-ip.
+Bug reports and pull requests are welcome on GitHub at https://github.com/vagrant-landrush/landrush-ip.
  This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License

data/lib/landrush-ip/action/install.rb

@@ -11,16 +11,12 @@ module LandrushIp
         @machine.guest.capability(:landrush_ip_installed)
       end
 
-      def override?
-        @machine.config.landrush_ip.override
-      end
-
-      def enabled?
-        override? || (@machine.config.key('landrush') && @machine.config.landrush.enabled)
+      def auto_install?
+        @machine.config.landrush_ip.auto_install
       end
 
       def install
-        @env[:ui].warn I18n.t('vagrant.config.landrush_ip.not_installed')
+        @env[:ui].info I18n.t('vagrant.config.landrush_ip.not_installed')
 
         raise Vagrant::LandrushIp::Error, :cannot_install unless @machine.guest.capability(:landrush_ip_install)
       end
@@ -31,11 +27,11 @@ module LandrushIp
         @machine = env[:machine]
 
         # Auto install in one of 2 cases:
-        # - landrush-ip is forcibly enabled via the override setting
+        # - landrush-ip is forcibly enabled via the auto_install setting
         # - Landrush is installed and enabled
-        install if enabled? && !installed?
+        install if auto_install? && !installed?
 
-        @env[:ui].info I18n.t('vagrant.config.landrush_ip.not_enabled') unless enabled?
+        @env[:ui].info I18n.t('vagrant.config.landrush_ip.not_enabled') unless auto_install?
       end
     end
   end

data/lib/landrush-ip/cap/linux/landrush_ip_get.rb

@@ -6,6 +6,8 @@ module LandrushIp
     module Linux
       module LandrushIpGet
         def self.landrush_ip_get(machine)
+          machine.guest.capability(:landrush_ip_install) unless machine.guest.capability(:landrush_ip_installed)
+
           result = ''
           machine.communicate.execute(command) do |type, data|
             result << data if type == :stdout

data/lib/landrush-ip/cap/windows/landrush_ip_get.rb

@@ -6,6 +6,8 @@ module LandrushIp
     module Windows
       module LandrushIpGet
         def self.landrush_ip_get(machine)
+          machine.guest.capability(:landrush_ip_install) unless machine.guest.capability(:landrush_ip_installed)
+
           result = ''
           machine.communicate.execute(command) do |type, data|
             result << data if type == :stdout

data/lib/landrush-ip/config.rb

@@ -5,27 +5,42 @@ require 'vagrant/util/template_renderer'
 module LandrushIp
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :override
+    attr_accessor :auto_install
 
     DEFAULTS = {
-      override: false
+      auto_install: false
     }.freeze
 
     def initialize
       @override = UNSET_VALUE
-      @logger   = Log4r::Logger.new('vagrantplugins::landruship::config')
+      @auto_install = UNSET_VALUE
+      @logger = Log4r::Logger.new('vagrantplugins::landruship::config')
     end
 
     def default_options(new_values = {})
-      @default_options = {} if @default_options == UNSET_VALUE
+      @default_options = DEFAULTS if @default_options == UNSET_VALUE
       @default_options.merge! new_values
     end
 
-    def override?
-      @override
+    def auto_install?
+      # Keeping override for backward compatibility
+      @auto_install || @override == true
     end
 
     def finalize!
-      @default_options = {} if @default_options == UNSET_VALUE
+      DEFAULTS.each do |name, value|
+        if instance_variable_get('@' + name.to_s) == UNSET_VALUE
+          instance_variable_set '@' + name.to_s, value
+        end
+      end
+    end
+
+    def validate(machine)
+      if @override != UNSET_VALUE
+        machine.env.ui.warn I18n.t('vagrant.config.landrush_ip.not_enabled')
+      end
+
+      nil
     end
   end
 end

data/lib/landrush-ip/version.rb

@@ -1,3 +1,3 @@
 module LandrushIp
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

data/locales/en.yml

@@ -2,8 +2,10 @@ en:
   vagrant:
     config:
       landrush_ip:
-        not_enabled: "Landrush IP override not enabled and Landrush was not found, nothing to do."
+        not_enabled: "Automatic installation for Landrush IP not enabled"
         not_installed: "Landrush IP not installed in guest yet (or it's an outdated version). Installing now."
+        warnings:
+          override: "landrush_ip.override is deprecated and will be removed in the next major version. Please use landrush_ip.auto_install instead."
         errors:
           unsupported_arch: "Unsupported architecture"
           cannot_install: "Unable to install landrush-ip"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: landrush-ip
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Paul Werelds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -64,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Capability plugin for Vagrant that allows more fine grained control over