vagrant-cucumber 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de77638a2311e90762aa7c72ea61e552383a47f
-  data.tar.gz: 4aa80e3e8498aee3d964e663de85a66f96410a56
+  metadata.gz: e3dd0d7308492b17caa19ea3f3f0ebee0b3073a2
+  data.tar.gz: b6f31e27c53386fef198c4b1294b22ffee91a5c4
 SHA512:
-  metadata.gz: bda45949dc846751a038e3ebb1257923c56856eb2e413146d20befcd1183df4816d9f6baa60be3ad0df1759f5bde58e2276061a1dceb158e551e144c07cb0598
-  data.tar.gz: 18ad2b90f094c62dcded36006315ec82f749e12fab9777c73c62ff6e79820bc15a29a5c7679f98d25567b4490b57dff53b92c45afa76755afa2b598374fed656
+  metadata.gz: 017ab2efd36c26b684f2837f4f9366ea1c241a444c934cae25059e131872c52325ce191a10944d36b07c9f4e7cc95938367d75819b85beb2bfaf413b17b90a8b
+  data.tar.gz: 0f39cbe18a5836e3efe7a8985fd7a6ff92776d59f9a46f1101d97866a471001baf72b58d6bd71c32d5d4179e7db62a4c6d99c870aba28383a078b09cd8d4fa3a

data/.rubocop.yml

@@ -0,0 +1,26 @@
+Style/IndentationWidth:
+    Width: 4
+
+Metrics/LineLength:
+    Enabled: false
+
+Metrics/MethodLength:
+    Enabled: false
+
+Style/Documentation:
+    Enabled: false
+
+Style/AccessorMethodName:
+    Enabled: false
+
+Style/ClassVars:
+    Enabled: false
+
+Metrics/AbcSize:
+    Enabled: false
+
+Lint/AmbiguousRegexpLiteral:
+    Enabled: false
+
+Style/FileName:
+    Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0 (December, 2016)
+ * Upgrade Cucumber to 2.x release. No longer requires native extensions for Gherkin,
+   thus allowing installation on Vagrant 1.9.1
+ * Support for libvirt using Sahara plugin
+
 ## 0.1.1 (26 July, 2016)
 
  * Retry snapshot operations on lock failure.

data/README.md

@@ -43,7 +43,7 @@ install this plugin is via the published gem:
 vagrant plugin install vagrant-cucumber
 ```
 
-`vagrant-cucumber` will install a version of cucumber >= 1.3.2 under the
+`vagrant-cucumber` will install a version of cucumber >= 2.4.0 under the
 Ruby environment provided by Vagrant.
 
 

data/example/Vagrantfile

@@ -1,11 +1,11 @@
 Vagrant.configure('2') do |config|
-    config.vm.box = "ubuntu/precise64"
+    config.vm.box = 'ubuntu/precise64'
 
     config.vm.provider :virtualbox
 
-    config.vm.provider :vmware_fusion do |fusion, override|
+    config.vm.provider :vmware_fusion do |_fusion, override|
         # Standard Ubuntu image doesn't exist for VMWare
-        override.vm.box = "hashicorp/precise64"
+        override.vm.box = 'hashicorp/precise64'
     end
 
     config.vm.define :vm1 do |vm1|
@@ -15,5 +15,4 @@ Vagrant.configure('2') do |config|
     config.vm.define :vm2 do |vm2|
         vm2.vm.hostname = 'vm2'
     end
-
 end

data/example/features/step_definitions/process.rb

@@ -1,16 +1,15 @@
-# Cucumber step definitions are defined like function definitions, and start 
+# Cucumber step definitions are defined like function definitions, and start
 # with a preposition or adverb (Given, When, Then, And, But).
-# 
+#
 # The regular expression defined will be matched against steps in the feature
 # files when cucumber runs.  The matched groups in the regex will be passed
-# in order as variables to the block.  In this case, the three groups are 
+# in order as variables to the block.  In this case, the three groups are
 # assigned to "condition", "process_name" and "vmre"
 #
 # More information on step definitions can be found at
 # https://github.com/cucumber/cucumber/wiki/Step-Definitions
 
 Then /there should(| not) be a process called "([^"]*)" running(#{VMRE})$/ do |condition, process_name, vmre|
-
     # First, we work out what virtual machine we're going to be dealing with
     # in this step.  The VMRE variable in the regex above is defined by
     # vagrant-cucumber to match various English-language ways in which we
@@ -28,50 +27,40 @@ Then /there should(| not) be a process called "([^"]*)" running(#{VMRE})$/ do |c
 
     machine = vagrant_glue.identified_vm(vmre)
 
-
     # Now we use the machine's communication interface (probably ssh, though
     # this is provider-dependent) to execute a shell command inside the VM.
 
     machine.communicate.tap do |comm|
+        rv = comm.execute(
+            "pidof #{process_name}",
+            error_check: false, # stop vagrant throwing an exception
+            # if the command returns non-zero
 
-        rv = comm.execute( 
-            "pidof #{process_name}", { 
-                :error_check => false, # stop vagrant throwing an exception
-            }                          # if the command returns non-zero
-            
-        ) do |type,data|
-
+        ) do |type, data|
             # Execute takes a block, which is yielded to whenever there's
             # output on stdout or stderr.  We handle any output in this block.
             #
             # In this case, we'll put all output onto stdout, but only if
             # @vagrant_cucumber_debug has been set.  This class variable will
-            # be set to true in the Before hook defined in 
+            # be set to true in the Before hook defined in
             # lib/vagrant-cucumber/step_definitions.rb
 
-            if @vagrant_cucumber_debug
-                puts "[:#{type}] #{data.chomp}"
-            end
-
+            puts "[:#{type}] #{data.chomp}" if @vagrant_cucumber_debug
         end
 
         # Output the status from the command if we're in debugging mode
-        if @vagrant_cucumber_debug
-            puts "Exit status of pidof command: #{rv}"
-        end
+        puts "Exit status of pidof command: #{rv}" if @vagrant_cucumber_debug
 
         # Cucumber steps are expected to exit cleanly if they worked ok, and
         # raise exceptions if they fail.  The following logic implements
         # the conditions in which we want to fail the step.
 
-        if rv != 0 and condition == ''
+        if rv != 0 && condition == ''
             raise "There was no proces called #{process_name} running on #{machine.name}"
         end
 
-        if rv == 0 and condition == ' not'
+        if rv == 0 && condition == ' not'
             raise "There was a process called #{process_name} running on #{machine.name}"
         end
-
     end
-
 end

data/example/features/support/env.rb

@@ -1,3 +1,3 @@
 require 'vagrant-cucumber/step_definitions'
 
-World( VagrantPlugins::Cucumber::Glue )
+World(VagrantPlugins::Cucumber::Glue)

data/lib/vagrant-cucumber/commands/cucumber.rb

@@ -1,17 +1,16 @@
-FORCE_COLOUR_ENV_VARS = [
-    'VAGRANT_CUCUMBER_FORCE_COLOR',
-    'VAGRANT_CUCUMBER_FORCE_COLOUR',
-]
+FORCE_COLOUR_ENV_VARS = %w(
+    VAGRANT_CUCUMBER_FORCE_COLOR
+    VAGRANT_CUCUMBER_FORCE_COLOUR
+).freeze
 
 module VagrantPlugins
     module Cucumber
         class CucumberCommand < Vagrant.plugin(2, :command)
             FORCE_COLOUR_ENV_VARS.each do |k|
-                if ENV.key?(k)
-                    require 'cucumber/term/ansicolor'
-                    ::Cucumber::Term::ANSIColor.coloring = true
-                    break
-                end
+                next unless ENV.key?(k)
+                require 'cucumber/term/ansicolor'
+                ::Cucumber::Term::ANSIColor.coloring = true
+                break
             end
 
             def execute
@@ -24,7 +23,7 @@ module VagrantPlugins
 
                 VagrantPlugins::Cucumber::Glue::VagrantGlue.set_environment(@env)
 
-                failure = ::Cucumber::Cli::Main.execute(@argv)
+                _ = ::Cucumber::Cli::Main.execute(@argv)
             end
         end
     end

data/lib/vagrant-cucumber/cucumber/formatter/html.rb

@@ -1,6 +1,6 @@
 require 'cucumber/formatter/html'
 
-ANSI_PATTERN = /\e\[(\d+)?(;\d+)?m/
+ANSI_PATTERN = /\e\[\d+([;\d]+)?m/
 
 def remove_ansi(string = nil)
     string.gsub(ANSI_PATTERN, '')
@@ -11,7 +11,6 @@ module VagrantPlugins
         module Formatter
             class Html < ::Cucumber::Formatter::Html
                 def puts(message)
-                    # TODO: Strip ansi escape codes
                     @delayed_messages << remove_ansi(message)
                 end
             end

data/lib/vagrant-cucumber/cucumber/formatter/pretty.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
                 # Use the Pretty formatter, but disable use of
                 #  delayed messages (ie. output each line at once)
 
-                def initialize(*args)
+                def initialize(runtime, path_or_io = STDOUT, options = {})
                     super
                     @delayed_messages = nil
                 end

data/lib/vagrant-cucumber/glue.rb

@@ -22,17 +22,15 @@ module VagrantPlugins
                 end
 
                 def initialize
-                    @vagrant_env = @@vagrant_env or raise "The vagrant_env hasn't been set"
+                    (@vagrant_env = @@vagrant_env) || raise("The vagrant_env hasn't been set")
                     @last_machine_mentioned = nil
                 end
 
                 def self.instance
-                    return @@instance ||= VagrantGlue.new
+                    @@instance ||= VagrantGlue.new
                 end
 
-                def vagrant_env
-                    @vagrant_env
-                end
+                attr_reader :vagrant_env
 
                 def get_last_vm
                     get_vm(@last_machine_mentioned)
@@ -55,9 +53,9 @@ module VagrantPlugins
                     end
 
                     unless machine_name
-                        raise "The VM '#{vmname}' is configured in the Vagrantfile "+
-                            "but has not been started.  Run 'vagrant up #{vmname}' and "+
-                            "specify a provider if necessary."
+                        raise "The VM '#{vmname}' is configured in the Vagrantfile "\
+                              "but has not been started.  Run 'vagrant up #{vmname}' and "\
+                              'specify a provider if necessary.'
                     end
 
                     machine_provider ||= vagrant_env.default_provider
@@ -74,10 +72,10 @@ module VagrantPlugins
 
                 def identified_vm(str)
                     case str
-                        when /^( on the last VM|)$/
-                            get_last_vm
-                        when /^ on the VM(?: called|) "([^"]+)"$/
-                            get_vm($1)
+                    when /^( on the last VM|)$/
+                        get_last_vm
+                    when /^ on the VM(?: called|) "([^"]+)"$/
+                        get_vm(Regexp.last_match(1))
                     end
                 end
 
@@ -87,17 +85,15 @@ module VagrantPlugins
                 def execute_on_vm(command, machine, opts = {})
                     @last_shell_command_output = {
                         stdout: '',
-                        stderr: '',
+                        stderr: ''
                     }
 
                     @last_shell_command_status = nil
 
                     machine.communicate.tap do |comm|
                         @last_shell_command_status = comm.execute(
-                            command, {
-                                error_check: false,
-                                sudo:        opts[:as_root]
-                            }
+                            command, error_check: false,
+                                     sudo:        opts[:as_root]
                         ) do |type, data|
                             if @vagrant_cucumber_debug
                                 puts "[:#{type}] #{data.chomp}"

data/lib/vagrant-cucumber/step_definitions.rb

@@ -1,19 +1,52 @@
 require 'to_regexp'
 
 def push_snapshot(vmname)
-    vagrant_glue.vagrant_env.cli('snapshot', 'push', vmname)
+    case machine_provider(vmname)
+    when :libvirt
+        vagrant_glue.vagrant_env.cli('sandbox', 'on', vmname)
+        vagrant_glue.vagrant_env.cli('sandbox', 'commit', vmname)
+    when :no_machines
+        return
+    else
+        vagrant_glue.vagrant_env.cli('snapshot', 'push', vmname)
+    end
 rescue Vagrant::Errors::EnvironmentLockedError
     sleep 0.2
     retry
+rescue LoadError
+    raise 'Please install the `sahara` vagrant plugin.'
+end
+
+def snapshots_enabled?(vmname)
+    case machine_provider(vmname)
+    when :libvirt
+        require 'sahara/session/factory'
+        ses = Sahara::Session::Factory.create(vagrant_glue.get_vm(vmname))
+        ses.is_snapshot_mode_on?
+    when :no_machines
+        return false
+    else
+        machine = vagrant_glue.get_vm(vmname)
+        !machine.provider.capability(:snapshot_list).empty?
+    end
+end
+
+def machine_provider(vmname)
+    if vmname.nil?
+        return :no_machines if vagrant_glue.vagrant_env.active_machines.empty?
+        vagrant_glue.vagrant_env.active_machines[0][1]
+    else
+        vagrant_glue.get_vm(vmname).provider_name
+    end
 end
 
 def pop_snapshot(vmname = nil)
-    args = [
-        'snapshot',
-        'pop',
-        '--no-provision',
-        '--no-delete',
-    ]
+    args =  case machine_provider(vmname)
+            when :libvirt
+                %w(sandbox rollback)
+            else
+                %w(snapshot pop --no-provision --no-delete)
+            end
     args << vmname unless vmname.nil?
 
     vagrant_glue.vagrant_env.cli(*args)
@@ -24,14 +57,12 @@ end
 
 Given /^there is a running VM called "([^"]*)"$/ do |vmname|
     machine = vagrant_glue.get_vm(vmname)
-
     machine.action(:up)
-
-    push_snapshot(vmname) if machine.provider.capability(:snapshot_list).empty?
+    push_snapshot(vmname) unless snapshots_enabled?(vmname)
 end
 
 When /^I roll back the VM called "([^"]*)"$/ do |vmname|
-    machine = vagrant_glue.get_vm(vmname)
+    _machine = vagrant_glue.get_vm(vmname)
 
     pop_snapshot(vmname)
 end
@@ -39,7 +70,7 @@ end
 Then /^(?:running|I run) the shell command `(.*)`(| as root)(#{VMRE})(?:|, it) should (succeed|fail)$/ do |command, as_root, vmre, condition|
     options = {
         as_root:         (as_root == ' as root'),
-        expect_non_zero: (condition == 'fail'),
+        expect_non_zero: (condition == 'fail')
     }
 
     options[:expect] = 0 if condition == 'succeed'
@@ -54,7 +85,7 @@ end
 Then /^(?:running|I run) the shell command `(.*)`(| as root)(#{VMRE})$/ do |command, as_root, vmre|
     options = {
         machine: vagrant_glue.identified_vm(vmre),
-        as_root: (as_root == ' as root'),
+        as_root: (as_root == ' as root')
     }
 
     vagrant_glue.execute_on_vm(
@@ -64,7 +95,7 @@ Then /^(?:running|I run) the shell command `(.*)`(| as root)(#{VMRE})$/ do |comm
     )
 end
 
-Then /^the (.+) of that shell command should(| not) match (\/.+\/)$/ do |stream, condition, re|
+Then %r{/^the (.+) of that shell command should(| not) match (\/.+\/)$/} do |stream, condition, re|
     stream.downcase!
 
     unless vagrant_glue.last_shell_command_output.key?(stream.to_sym)

data/lib/vagrant-cucumber/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module Cucumber
-        VERSION = '0.1.1'
+        VERSION = '1.0.0'.freeze
     end
 end

data/vagrant-cucumber.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'vagrant-cucumber/version'
 
 Gem::Specification.new do |s|
@@ -24,8 +24,9 @@ Gem::Specification.new do |s|
         end
     end
 
-    s.add_runtime_dependency 'cucumber', '~>1.3.2'
-    s.add_runtime_dependency 'to_regexp', '>=0.2.1'
+    s.add_runtime_dependency 'cucumber', '~>2.4'
+    s.add_runtime_dependency 'to_regexp', '~>0.2.1'
+    s.add_runtime_dependency 'sahara', '~>0.0.17'
 
     s.files         = files
     s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jon Topper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: to_regexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: sahara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.17
 description: This plugin makes it possible for Cucumber to interact with Vagrant
 email:
 - jon@scalefactory.com
@@ -45,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE