vagrant-timezone 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3dc9ef7975ca29976ae085bd1c28252c4313af33
-  data.tar.gz: da79dd0f54ab3c13b1d5b92e104d13dcc8936b6a
+SHA256:
+  metadata.gz: 4f3f7a021665f40589dcca99456a0d051b841a066b96e0acb2519724d7f6e418
+  data.tar.gz: d99773373bc1d2d3f9c520ed211e82738a5e894f835eb5bfd64b20b768ac6299
 SHA512:
-  metadata.gz: 2b4b013626bb6dd6464dfbc092af93cfedbd5742af68cfb0c6b5a350e49e8904de2a2ddd7e8fbca0c34247a7605b0fd3c43c4d5944d386e749d2bcf853649da8
-  data.tar.gz: a4763abc1213a5d355fe3161e76036aeab4255483266a721f67d53bbe33dd3937ded25e32539fdcd0c6f809a084e179f0303a3e00015c2151da93613a0c8ac8a
+  metadata.gz: df75274bfc5c09b51d5972d8c0c70330d99118af12118f8eda3a30a77d5bfc623ef599637d6955d883aa746875b46137b1a231a8c70a36dafb013ab3d96e98a2
+  data.tar.gz: bf6fcae47144ad121424154ae803223e0c062571f9d93ac358853724c859c27c6cadd1ba0f95262178b9250168e7a457a1bec46721af3bd55ea3011eb8306f15

data/.gitignore

@@ -1,3 +1,4 @@
 /.bundle
 /Gemfile.lock
 *.gem
+/test/acceptance/boxes/

data/.rspec

@@ -0,0 +1,5 @@
+--color
+--default-path test
+--format documentation
+--order random
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,42 @@
+AllCops:
+  DisplayStyleGuide: true
+  ExtraDetails: true
+  TargetRubyVersion: 2.2
+
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Metrics/BlockLength:
+  Exclude:
+    - '*.gemspec'
+    - '**/*.rake'
+    - '**/*_spec.rb'
+
+Metrics/ClassLength:
+  Severity: warning
+
+Metrics/LineLength:
+  Max: 100
+  Severity: warning
+
+Metrics/MethodLength:
+  Max: 13
+  Severity: warning
+
+Naming/FileName:
+  Exclude:
+    - 'lib/vagrant-timezone.rb'
+    - '**/vagrant-spec.config.rb'
+
+Style/GuardClause:
+  MinBodyLength: 3
+
+Style/NegatedIf:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false

data/.travis.yml

@@ -2,19 +2,24 @@ language: ruby
 cache: bundler
 sudo: false
 
-before_install:
-  - rvm @global do gem uninstall bundler --all --executables
-  - gem uninstall bundler --all --executables
-  - gem install bundler --version '~> 1.5.2'
-  - bundle --version
 bundler_args: --without=development
 
-rvm: 2.2.5
-env: VAGRANT_VERSION=v1.9.1
+script:
+  - bundle exec rake test:unit
+  - bundle exec rake style
+
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+rvm: 2.4.4
 matrix:
   include:
-    - env: VAGRANT_VERSION=v1.2.7
-      rvm: 1.9.3
+    - env: VAGRANT_VERSION=v2.2.3
+    - env: VAGRANT_VERSION=v2.0.4
+    - env:
+        - VAGRANT_VERSION=v1.9.8
+      rvm: 2.2.5
     - env: VAGRANT_VERSION=master
   allow_failures:
     - env: VAGRANT_VERSION=master

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.3.0 / 2019-01-10
+
+- Use `timedatectl` on all Linux distributions if found ([GH-10][], [GH-7][], [GH-5][])
+    * `systemd` is now used on many Linux distros (e.g. Debian based ones)
+
+- Improve testing by adding acceptance and style tests ([GH-11][])
+
+[GH-5]: https://github.com/tmatilai/vagrant-timezone/issues/5 "Issue 5"
+[GH-7]: https://github.com/tmatilai/vagrant-timezone/issues/7 "Issue 7"
+[GH-10]: https://github.com/tmatilai/vagrant-timezone/issues/10 "Issue 10"
+[GH-11]: https://github.com/tmatilai/vagrant-timezone/issues/11 "Issue 11"
+
 # 1.2.0 / 2017-02-25
 
 Features:

data/Gemfile

@@ -1,12 +1,23 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'vagrant',
-  git: 'https://github.com/mitchellh/vagrant.git',
-  tag: ENV.fetch('VAGRANT_VERSION', 'v1.9.1')
+    git: 'https://github.com/hashicorp/vagrant.git',
+    tag: ENV.fetch('VAGRANT_VERSION', 'v2.2.3')
 
 gem 'rake'
 gem 'rspec', '~> 3.1'
+gem 'rubocop', '~> 0.62'
+
+gem 'vagrant-spec',
+    git: 'https://github.com/hashicorp/vagrant-spec.git'
+
+group :development do
+  gem 'guard-rspec', '~> 4.7'
+  gem 'guard-rubocop', '~> 1.3'
+end
 
 group :plugins do
-  gem 'vagrant-timezone', path: '.'
+  gemspec
 end

data/Guardfile

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+spec_dir = 'test/unit'
+
+group :ruby, halt_on_fail: true do
+  guard :rspec, cmd: 'bundle exec rspec --format progress', spec_paths: [spec_dir] do
+    # RSpec files
+    watch('test/spec_helper.rb') { spec_dir }
+    watch(%r{^#{spec_dir}/.+_spec\.rb$})
+
+    # Ruby files
+    watch(%r{^lib/(.+)\.rb$}) { |m| "#{spec_dir}/#{m[1]}_spec.rb" }
+  end
+
+  guard :rubocop do
+    watch(/\.rb$/)
+    watch(/\.gemspec$/)
+    watch('Gemfile')
+    watch('Rakefile')
+    watch(%r{/Vagrantfile$})
+    watch('.rubocop.yml') { '.' }
+  end
+end

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2014-2017 Teemu Matilainen <teemu.matilainen@iki.fi>
+Copyright (c) 2014-2019 Teemu Matilainen <teemu.matilainen@iki.fi>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -45,14 +45,14 @@ The plugin is supposed to be compatible with all Vagrant providers and other plu
 
 At the moment the supported platforms include:
 
-- Linux:
+- All Linux guests. Confirmed at least:
     * Arch
     * CoreOS
     * Debian (and derivatives)
     * Gentoo
     * RedHat (and derivatives)
 
-- BSD:
+- All BSD guests:
     * FreeBSD
     * NetBSD
     * OpenBSD

data/Rakefile

@@ -1,14 +1,30 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task default: 'test:unit'
+task default: ['test:unit', 'style']
 
-# Remove 'install' task as the gem is installed to Vagrant, not to system
-Rake::Task[:install].clear
+desc 'Run all tests'
+task test: ['test:unit', 'test:acceptance']
 
 namespace :test do
-  RSpec::Core::RakeTask.new('unit') do |task|
-    task.pattern = 'spec/unit/**/*_spec.rb'
+  desc 'Run unit tests'
+  RSpec::Core::RakeTask.new(:unit) do |task|
+    task.pattern = 'test/unit/**/*_spec.rb'
   end
+
+  load 'tasks/acceptance.rake'
+end
+
+desc 'Run all style checks'
+task style: ['style:ruby']
+
+namespace :style do
+  desc 'Run style checks for Ruby'
+  RuboCop::RakeTask.new(:ruby)
 end
-task spec: ['test:unit']
+
+# Remove 'install' task as the gem is installed to Vagrant, not to system
+Rake::Task[:install].clear

data/lib/vagrant-timezone/action/set_timezone.rb

@@ -5,19 +5,20 @@ module VagrantPlugins
     module Action
       # Vagrant middleware action that sets the specified time zone
       class SetTimeZone
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
+        def call(env) # rubocop:disable Metrics/AbcSize
           @app.call(env)
 
           machine = env[:machine]
           timezone = machine.config.timezone.value
+
           if timezone.nil?
             logger.info I18n.t('vagrant_timezone.not_enabled')
           elsif machine.guest.capability?(:change_timezone)
-            env[:ui].info I18n.t('vagrant_timezone.configuring')
+            env[:ui].info I18n.t('vagrant_timezone.configuring', zone: timezone)
             machine.guest.capability(:change_timezone, timezone)
           else
             logger.info I18n.t('vagrant_timezone.not_supported')

data/lib/vagrant-timezone/cap/debian.rb

@@ -1,10 +1,12 @@
+require_relative 'linux'
+
 module VagrantPlugins
   module TimeZone
     module Cap
       # Debian capabilities for changing time zone
-      class Debian
-        # Set the time zone
-        def self.change_timezone(machine, timezone)
+      class Debian < Linux
+        # Set the time zone if `timedatectl` is not found
+        def self.change_timezone_generic(machine, timezone)
           machine.communicate.tap do |comm|
             comm.sudo("echo '#{timezone}' > /etc/timezone")
             comm.sudo('dpkg-reconfigure --frontend noninteractive tzdata')

data/lib/vagrant-timezone/cap/gentoo.rb

@@ -1,17 +1,17 @@
+require_relative 'linux'
+
 module VagrantPlugins
   module TimeZone
     module Cap
       # Gentoo capabilities for changing time zone
-      class Gentoo
-        # Set the time zone
-        def self.change_timezone(machine, timezone)
+      class Gentoo < Linux
+        # Set the time zone if `timedatectl` is not found
+        def self.change_timezone_generic(machine, timezone)
           machine.communicate.tap do |comm|
-            if comm.test('which timedatectl', sudo: true)
-              comm.sudo("timedatectl set-timezone '#{timezone}'")
-            else
-              comm.sudo("echo '#{timezone}' > /etc/timezone")
-              comm.sudo('emerge --config timezone-data')
-            end
+            super
+
+            comm.sudo("echo '#{timezone}' > /etc/timezone")
+            comm.sudo('emerge --config timezone-data')
           end
         end
       end

data/lib/vagrant-timezone/cap/linux.rb

@@ -0,0 +1,35 @@
+require_relative 'unix'
+
+module VagrantPlugins
+  module TimeZone
+    module Cap
+      # Generic Linix capability for changing time zone
+      class Linux
+        # Set the time zone.
+        # Uses `timedatectl` if found.
+        def self.change_timezone(machine, timezone)
+          if timedatectl?(machine)
+            change_timezone_timedatectl(machine, timezone)
+          else
+            change_timezone_generic(machine, timezone)
+          end
+        end
+
+        def self.timedatectl?(machine)
+          machine.communicate.test('which timedatectl', sudo: true)
+        end
+
+        def self.change_timezone_timedatectl(machine, timezone)
+          machine.communicate.sudo("timedatectl set-timezone '#{timezone}'")
+        end
+
+        # Set the time zone if `timedatectl` is not found.
+        # Defaults to `Unix.change_timezone`, but is overridden by distro
+        # specific classes.
+        def self.change_timezone_generic(machine, timezone)
+          Unix.change_timezone(machine, timezone)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-timezone/cap/redhat.rb

@@ -1,16 +1,17 @@
-require_relative 'unix'
+require_relative 'linux'
 
 module VagrantPlugins
   module TimeZone
     module Cap
       # RedHat capabilities for changing time zone
-      class RedHat < Unix
-        # Set the time zone
-        def self.change_timezone(machine, timezone)
+      class RedHat < Linux
+        # Set the time zone if `timedatectl` is not found
+        def self.change_timezone_generic(machine, timezone)
           super
 
           machine.communicate.sudo(
-            "echo 'ZONE=\"#{timezone}\"' > /etc/sysconfig/clock")
+            "echo 'ZONE=\"#{timezone}\"' > /etc/sysconfig/clock"
+          )
         end
       end
     end

data/lib/vagrant-timezone/config.rb

@@ -26,7 +26,7 @@ module VagrantPlugins
 
           # We set timezone offset negative to match POSIX standards
           # https://github.com/eggert/tz/blob/master/etcetera
-          @value = sprintf('Etc/GMT%+d', -(Time.now.utc_offset/3600))
+          @value = format('Etc/GMT%+d', -(Time.now.utc_offset / 3600))
         end
       end
     end

data/lib/vagrant-timezone/plugin.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
     # @!parse class Plugin < Vagrant::Plugin::V2::Plugin; end
     class Plugin < Vagrant.plugin('2')
       # Compatible Vagrant versions
-      VAGRANT_VERSION_REQUIREMENT = '>= 1.2.0'
+      VAGRANT_VERSION_REQUIREMENT = '>= 1.2.0'.freeze
 
       # Returns true if the Vagrant version fulfills the requirements
       #
@@ -16,7 +16,8 @@ module VagrantPlugins
       # @return [Boolean]
       def self.check_vagrant_version(*requirements)
         Gem::Requirement.new(*requirements).satisfied_by?(
-          Gem::Version.new(Vagrant::VERSION))
+          Gem::Version.new(Vagrant::VERSION)
+        )
       end
 
       # Verifies that the Vagrant version fulfills the requirements
@@ -24,18 +25,19 @@ module VagrantPlugins
       # @raise [VagrantPlugins::TimeZone::VagrantVersionError] if this plugin
       # is incompatible with the Vagrant version
       def self.check_vagrant_version!
-        if !check_vagrant_version(VAGRANT_VERSION_REQUIREMENT)
-          msg = I18n.t(
-            'vagrant_timezone.errors.vagrant_version',
-            requirement: VAGRANT_VERSION_REQUIREMENT.inspect)
-          $stderr.puts msg
-          raise msg
-        end
+        return if check_vagrant_version(VAGRANT_VERSION_REQUIREMENT)
+
+        msg = I18n.t(
+          'vagrant_timezone.errors.vagrant_version',
+          requirement: VAGRANT_VERSION_REQUIREMENT.inspect
+        )
+        warn msg
+        raise msg
       end
 
       # Initializes the internationalization strings
       def self.setup_i18n
-        I18n.load_path << File.expand_path('../../../locales/en.yml', __FILE__)
+        I18n.load_path << File.expand_path('../../locales/en.yml', __dir__)
         I18n.reload!
       end
 
@@ -59,17 +61,7 @@ module VagrantPlugins
         hook.after Vagrant::Action::Builtin::Provision, Action::SetTimeZone
       end
 
-      guest_capability 'arch', 'change_timezone' do
-        require_relative 'cap/arch'
-        Cap::Arch
-      end
-
-      guest_capability 'coreos', 'change_timezone' do
-        require_relative 'cap/coreos'
-        Cap::CoreOS
-      end
-
-      guest_capability 'darwin', 'change_timezone' do
+      guest_capability 'bsd', 'change_timezone' do
         require_relative 'cap/unix'
         Cap::Unix
       end
@@ -79,24 +71,14 @@ module VagrantPlugins
         Cap::Debian
       end
 
-      guest_capability 'freebsd', 'change_timezone' do
-        require_relative 'cap/unix'
-        Cap::Unix
-      end
-
       guest_capability 'gentoo', 'change_timezone' do
         require_relative 'cap/gentoo'
         Cap::Gentoo
       end
 
-      guest_capability 'netbsd', 'change_timezone' do
-        require_relative 'cap/unix'
-        Cap::Unix
-      end
-
-      guest_capability 'openbsd', 'change_timezone' do
-        require_relative 'cap/unix'
-        Cap::Unix
+      guest_capability 'linux', 'change_timezone' do
+        require_relative 'cap/linux'
+        Cap::Linux
       end
 
       guest_capability 'redhat', 'change_timezone' do

data/lib/vagrant-timezone/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module TimeZone
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/locales/en.yml

@@ -2,7 +2,7 @@ en:
   vagrant_timezone:
     not_enabled: "Time zone not configured"
     not_supported: "Setting time zone not supported"
-    configuring: "Setting time zone..."
+    configuring: "Setting time zone to '%{zone}'..."
 
     errors:
       vagrant_version: |-

data/tasks/acceptance.rake

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative '../test/acceptance/support/box_helper'
+
+desc 'Run all acceptance tests'
+task acceptance: 'acceptance:all'
+
+namespace :acceptance do
+  include VagrantTimezone::BoxHelper
+
+  task all: providers
+
+  providers.each do |provider|
+    desc "Run all acceptance tests for #{provider}"
+    task provider => provider.boxes.map { |box| "#{provider}:#{box}" }
+
+    namespace provider.name do
+      provider.boxes.each do |box|
+        desc "Run acceptance tests for #{box} on #{provider}"
+        task box.name => box.path do
+          env = {
+            'VAGRANT_SPEC_PROVIDER' => provider.name,
+            'VAGRANT_SPEC_BOX_PATH' => box.path.to_s
+          }
+          cmd = ['bundle', 'exec', 'vagrant-spec', 'test']
+          cmd << "--config=#{config_path('vagrant-spec.config.rb')}"
+
+          rake_output_message "Running acceptance tests for #{box} on #{provider}"
+          rake_output_message cmd.join(' ')
+          system(env, *cmd)
+        end
+
+        file box.path => provider.box_dir do
+          rake_output_message "Downloading #{box} for #{provider}"
+          download(box)
+        end
+
+        directory provider.box_dir
+      end
+    end
+  end
+end

data/test/acceptance/config/boxes.yaml

@@ -0,0 +1,8 @@
+virtualbox:
+  - ubuntu/bionic64
+  - debian/wheezy64
+  - centos/7
+  - archlinux/archlinux
+  - generic/gentoo
+  - generic/freebsd12
+  - generic/openbsd6

data/test/acceptance/config/vagrant-spec.config.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative '../support/spec_helper.rb'
+
+Vagrant::Spec::Acceptance.configure do |c|
+  provider = ENV.fetch('VAGRANT_SPEC_PROVIDER')
+  box_path = ENV.fetch('VAGRANT_SPEC_BOX_PATH')
+
+  c.component_paths = [File.expand_path('../vagrant-timezone', __dir__)]
+  c.skeleton_paths  = [File.expand_path('../skeletons', __dir__)]
+
+  c.provider(provider, box_path: box_path)
+end

data/test/acceptance/skeletons/timezone/Vagrantfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+timezone = ENV['VAGRANT_SPEC_TIMEZONE']
+timezone = :host if timezone == ':host'
+
+Vagrant.configure('2') do |config|
+  config.vm.box = 'box'
+
+  config.timezone.value = timezone if timezone
+end

data/test/acceptance/support/box_helper.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'cgi'
+require 'fileutils'
+require 'json'
+require 'open-uri'
+require 'pathname'
+require 'tempfile'
+require 'yaml'
+
+module VagrantTimezone
+  module BoxHelper
+    ROOT_DIR = Pathname.new(__dir__).join('..')
+    BOX_DIR = ROOT_DIR.join('boxes')
+    CONFIG_DIR = ROOT_DIR.join('config')
+
+    def config_path(file_name)
+      CONFIG_DIR.join(file_name)
+    end
+
+    def providers
+      @providers ||= begin
+        data = IO.read(config_path('boxes.yaml'))
+        YAML.safe_load(data).map do |provider, boxes|
+          Provider.new(provider, boxes)
+        end
+      end
+    end
+
+    def download(box)
+      Downloader.download(box)
+    end
+
+    class Provider
+      attr_reader :name, :boxes
+
+      def initialize(name, box_names)
+        @name = name
+        @boxes = box_names.map { |box| Box.new(box, self) }
+      end
+
+      alias to_s name
+
+      def box_dir
+        @box_dir ||= BOX_DIR.join(name)
+      end
+    end
+
+    class Box
+      attr_reader :name, :provider
+
+      def initialize(name, provider)
+        %r{^[^/]+/[^/]+$}.match(name) ||
+          raise(ArgumentError, 'Box names must be in form of <user>/<box>')
+
+        @name = name
+        @provider = provider
+      end
+
+      alias to_s name
+
+      def path
+        @path ||= provider.box_dir.join("#{sanitized_name}.box")
+      end
+
+      def sanitized_name
+        name.tr('/', '_')
+      end
+
+      def metadata_url
+        user, box = name.split('/')
+        URI("https://app.vagrantup.com/#{CGI.escape(user)}/boxes/#{box}.json")
+      end
+    end
+
+    class Downloader
+      def self.download(box)
+        metadata = download_metadata(box)
+
+        url = find_url(metadata, box.provider)
+        raise StandardError, "No active versions found for #{box} for #{box.provider}" if !url
+
+        download_box(box, url)
+      end
+
+      def self.download_metadata(box)
+        data = box.metadata_url.open.read
+        JSON.parse(data)
+      end
+
+      def self.download_box(box, url)
+        case io = url.open
+        when Tempfile
+          io.close
+          FileUtils.mv(io.path, box.path)
+        else
+          IO.copy_stream(io, box.path)
+        end
+      end
+
+      def self.find_url(metadata, provider)
+        metadata['versions'].each do |v|
+          next if v['status'] != 'active'
+
+          v['providers'].each do |p|
+            return URI(p['url']) if p['name'] == provider.name
+          end
+        end
+      end
+    end
+  end
+end

data/test/acceptance/support/spec_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'vagrant-spec/acceptance'
+
+# Dirty monkey patch to work around
+# https://github.com/hashicorp/vagrant-spec/pull/17
+module Vagrant
+  module Spec
+    class AcceptanceIsolatedEnvironment
+      attr_reader :env if !method_defined?(:env)
+    end
+  end
+end
+
+# Disable Vagrant's version checks
+ENV['VAGRANT_CHECKPOINT_DISABLE'] = '1'

data/test/acceptance/vagrant-timezone/timezone_spec.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+shared_examples 'provider/timezone' do |provider, options|
+  if !options[:box_path]
+    raise ArgumentError,
+          "'box_path' option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  if provider.to_s == 'virtualbox'
+    let(:extra_env) do
+      # Special magic for VirtualBox
+      { 'VBOX_USER_HOME' => '{{homedir}}' }
+    end
+  end
+
+  before do
+    environment.skeleton('timezone')
+    environment.env['VAGRANT_SPEC_TIMEZONE'] = timezone
+
+    assert_execute('vagrant', 'box', 'add', 'box', options[:box_path])
+  end
+
+  after do
+    execute('vagrant', 'destroy', '--force')
+  end
+
+  context 'when starting' do
+    context 'without configuration' do
+      let(:timezone) { nil }
+
+      it 'does not configure the time zone' do
+        result = assert_execute('vagrant', 'up', "--provider=#{provider}")
+        expect(result.stdout).not_to match(/Setting time zone/)
+      end
+    end
+
+    context 'with a time zone name' do
+      # Something without DST so that the offset is always known
+      let(:timezone) { 'America/Argentina/Buenos_Aires' }
+
+      it 'configures the specified time zone' do
+        result = assert_execute('vagrant', 'up', "--provider=#{provider}")
+        expect(result.stdout).to match(/Setting time zone to '#{timezone}'/)
+
+        result = assert_execute('vagrant', 'ssh', '-c', 'date "+TZ: %z"')
+        expect(result.stdout).to match(/^TZ: -0300$/)
+      end
+    end
+  end
+
+  context 'when reloading' do
+    context 'with :host' do
+      # First configure to something else than the host
+      let(:timezone) do
+        offset = host_offset[0, 3].to_i
+        offset = 10 if offset.zero?
+        # Negate the host offset!
+        # https://github.com/eggert/tz/blob/master/etcetera
+        Kernel.format('Etc/GMT%+d', offset)
+      end
+
+      let(:host_offset) { `date "+%z"`.chomp }
+
+      it 'configures the same time zone than on the host' do
+        status('First start the machine with other timezone')
+        assert_execute('vagrant', 'up', "--provider=#{provider}")
+
+        # Change the configuration in Vagrantfile
+        environment.env['VAGRANT_SPEC_TIMEZONE'] = ':host'
+
+        status('Reloading with :host')
+        result = assert_execute('vagrant', 'reload')
+        expect(result.stdout).to match(%r{Setting time zone to 'Etc/GMT})
+
+        result = assert_execute('vagrant', 'ssh', '-c', 'date "+TZ: %z"')
+        expect(result.stdout).to match(/^TZ: #{Regexp.escape(host_offset)}$/)
+      end
+    end
+  end
+end

data/test/spec_helper.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)

data/{spec → test}/unit/vagrant-timezone/cap/windows_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
 require 'vagrant-timezone/cap/windows'
 
 describe VagrantPlugins::TimeZone::Cap::Windows do

data/{spec → test}/unit/vagrant-timezone/config_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
 require 'vagrant-timezone/config'
 
 describe VagrantPlugins::TimeZone::Config do
@@ -23,7 +24,7 @@ describe VagrantPlugins::TimeZone::Config do
     end
 
     it 'converts `:host` to the zone of the host' do
-      allow(Time).to receive(:now).and_return(Time.new(2016,7,10,2,12,0, '+03:00'))
+      allow(Time).to receive(:now).and_return(Time.new(2016, 7, 10, 2, 12, 0, '+03:00'))
       subject.value = :host
       subject.finalize!
       expect(subject.value).to eq('Etc/GMT-3')

data/vagrant-timezone.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-timezone/version'
 
@@ -22,7 +21,7 @@ Gem::Specification.new do |spec|
     'Blue.Dog.Archolite@gmail.com'
   ]
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-timezone
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Teemu Matilainen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the time zone of a virtual machine
 email:
@@ -22,18 +22,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-timezone.rb
 - lib/vagrant-timezone/action/set_timezone.rb
-- lib/vagrant-timezone/cap/arch.rb
-- lib/vagrant-timezone/cap/coreos.rb
 - lib/vagrant-timezone/cap/debian.rb
 - lib/vagrant-timezone/cap/gentoo.rb
+- lib/vagrant-timezone/cap/linux.rb
 - lib/vagrant-timezone/cap/redhat.rb
 - lib/vagrant-timezone/cap/unix.rb
 - lib/vagrant-timezone/cap/windows.rb
@@ -42,9 +44,16 @@ files:
 - lib/vagrant-timezone/plugin.rb
 - lib/vagrant-timezone/version.rb
 - locales/en.yml
-- spec/spec_helper.rb
-- spec/unit/vagrant-timezone/cap/windows_spec.rb
-- spec/unit/vagrant-timezone/config_spec.rb
+- tasks/acceptance.rake
+- test/acceptance/config/boxes.yaml
+- test/acceptance/config/vagrant-spec.config.rb
+- test/acceptance/skeletons/timezone/Vagrantfile
+- test/acceptance/support/box_helper.rb
+- test/acceptance/support/spec_helper.rb
+- test/acceptance/vagrant-timezone/timezone_spec.rb
+- test/spec_helper.rb
+- test/unit/vagrant-timezone/cap/windows_spec.rb
+- test/unit/vagrant-timezone/config_spec.rb
 - vagrant-timezone.gemspec
 homepage: http://github.com/tmatilai/vagrant-timezone
 licenses:
@@ -65,12 +74,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that configures the time zone of a virtual machine
 test_files:
-- spec/spec_helper.rb
-- spec/unit/vagrant-timezone/cap/windows_spec.rb
-- spec/unit/vagrant-timezone/config_spec.rb
+- test/acceptance/config/boxes.yaml
+- test/acceptance/config/vagrant-spec.config.rb
+- test/acceptance/skeletons/timezone/Vagrantfile
+- test/acceptance/support/box_helper.rb
+- test/acceptance/support/spec_helper.rb
+- test/acceptance/vagrant-timezone/timezone_spec.rb
+- test/spec_helper.rb
+- test/unit/vagrant-timezone/cap/windows_spec.rb
+- test/unit/vagrant-timezone/config_spec.rb

data/lib/vagrant-timezone/cap/arch.rb

@@ -1,13 +0,0 @@
-module VagrantPlugins
-  module TimeZone
-    module Cap
-      # Arch capabilities for changing time zone
-      class Arch
-        # Set the time zone
-        def self.change_timezone(machine, timezone)
-          machine.communicate.sudo("timedatectl set-timezone '#{timezone}'")
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-timezone/cap/coreos.rb

@@ -1,13 +0,0 @@
-module VagrantPlugins
-  module TimeZone
-    module Cap
-      # CoreOS capabilities for changing time zone
-      class CoreOS
-        # Set the time zone
-        def self.change_timezone(machine, timezone)
-          machine.communicate.sudo("timedatectl set-timezone '#{timezone}'")
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-  config.color = true
-  config.tty = true
-end