vagrant-timezone 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5e50694d3d8b0660f8948191821fbe71f9467d
-  data.tar.gz: 3cf304ddc2e8acef5a127dac46ebd91f70ca1654
+  metadata.gz: 3dc9ef7975ca29976ae085bd1c28252c4313af33
+  data.tar.gz: da79dd0f54ab3c13b1d5b92e104d13dcc8936b6a
 SHA512:
-  metadata.gz: 19d1dc0c714ae91508fa2019ff37675365978d5eea4a9f84ef026529f2ff8e7e62cbb16b929fc54b7c4b98ce1962c75d2bff3b44d2b1d079dcca3c900225fd96
-  data.tar.gz: 825960e499203d008277a5c1ec1fa5622c8691d833577c97fb156a4a1b0b07b9ff9d618563ee701559c118238430252a069c1f180e9d4f81c809286ac54e4f26
+  metadata.gz: 2b4b013626bb6dd6464dfbc092af93cfedbd5742af68cfb0c6b5a350e49e8904de2a2ddd7e8fbca0c34247a7605b0fd3c43c4d5944d386e749d2bcf853649da8
+  data.tar.gz: a4763abc1213a5d355fe3161e76036aeab4255483266a721f67d53bbe33dd3937ded25e32539fdcd0c6f809a084e179f0303a3e00015c2151da93613a0c8ac8a

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+cache: bundler
+sudo: false
 
 before_install:
   - rvm @global do gem uninstall bundler --all --executables
@@ -7,8 +9,8 @@ before_install:
   - bundle --version
 bundler_args: --without=development
 
-rvm: 2.0.0
-env: VAGRANT_VERSION=v1.7.4
+rvm: 2.2.5
+env: VAGRANT_VERSION=v1.9.1
 matrix:
   include:
     - env: VAGRANT_VERSION=v1.2.7

data/CHANGELOG.md

@@ -1,10 +1,18 @@
+# 1.2.0 / 2017-02-25
+
+Features:
+
+- Support Windows guests ([GH-4][])
+
+[GH-4]: https://github.com/tmatilai/vagrant-timezone/issues/4 "Issue 4"
+
 # 1.1.0 / 2015-10-01
 
 Features:
 
 - Add option (`config.timezone.value = :host`) to synchronize the guest timezone with the host ([GH-2][])
 
-[GH-2]: https://github.com/tmatilai/vagrant-proxyconf/issues/2 "Issue 2"
+[GH-2]: https://github.com/tmatilai/vagrant-timezone/issues/2 "Issue 2"
 
 # 1.0.0 / 2014-10-27
 

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'vagrant',
   git: 'https://github.com/mitchellh/vagrant.git',
-  ref: ENV.fetch('VAGRANT_VERSION', 'v1.7.4')
+  tag: ENV.fetch('VAGRANT_VERSION', 'v1.9.1')
 
 gem 'rake'
 gem 'rspec', '~> 3.1'

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2014 Teemu Matilainen <teemu.matilainen@iki.fi>
+Copyright (c) 2014-2017 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

@@ -31,6 +31,8 @@ end
 
 The value can be anything that the [tz database supports](http://en.wikipedia.org/wiki/List_of_tz_database_time_zones) (the "TZ" column). For example "UTC" or "Europe/Helsinki".
 
+For Windows guests the value can be a name in [this table](https://msdn.microsoft.com/en-us/library/ms912391(v=winembedded.11).aspx), or "Etc/GMT`<offset>`" (like with the `:host` value, see the next chapter).
+
 ### Matching the Host Timezone
 
 If the special symbol `:host` is passed at the parameter (`config.timezone.value = :host`), the plugin will attempt to set the guest timezone offset to match the current offset of the host. Because of limitations in Ruby's ability to get the named timezone from the host, it will instead convert the host's timezone offset to a calculated offset from UTC. So for example, on the west coast of the USA the calculated timezone might be `Etc/GMT+8`. After a change in the host's timezone (including a change due to Daylight Savings Time taking effect), the next time the Vagrantfile is run the guest clock will be updated to match. Note that this functionality has only been tested with an OS X host and Linux guest.
@@ -55,3 +57,9 @@ At the moment the supported platforms include:
     * NetBSD
     * OpenBSD
     * OS X
+
+- Windows
+
+## Development
+
+As Vagrant bundles Ruby, the same version should be used when developing this plugin. For example Vagrant 1.9 comes with Ruby 2.2.

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

@@ -0,0 +1,53 @@
+module VagrantPlugins
+  module TimeZone
+    module Cap
+      # Generic Windows capabilities for changing time zone
+      class Windows
+        # Set the time zone
+        def self.change_timezone(machine, timezone)
+          machine.communicate.sudo(
+            "tzutil /s \"#{timezone_name(timezone)}\"",
+            shell: 'powershell'
+          )
+        end
+
+        # If the specified timezone is in format like "Etc/GMT+8", returns the
+        # matching timezone name. Otherwise just returns the passed timezone.
+        def self.timezone_name(timezone)
+          if %r{^Etc/GMT(?<offset>[+-]\d+)$} =~ timezone
+            TIMEZONE_NAMES.fetch(offset)
+          else
+            timezone
+          end
+        end
+
+        TIMEZONE_NAMES = {
+          '-12' => 'Dateline Standard Time',
+          '-11' => 'UTC-11',
+          '-10' => 'Hawaiian Standard Time',
+          '-9'  => 'Alaskan Standard Time',
+          '-8'  => 'Pacific Standard Time',
+          '-7'  => 'Mountain Standard Time',
+          '-6'  => 'Central Standard Time',
+          '-5'  => 'Eastern Standard Time',
+          '-4'  => 'Atlantic Standard Time',
+          '-3'  => 'Greenland Standard Time',
+          '-2'  => 'UTC-02',
+          '-1'  => 'Azores Standard Time',
+          '+0'  => 'UTC',
+          '+1'  => 'Central Europe Standard Time',
+          '+2'  => 'E. Europe Standard Time',
+          '+3'  => 'Russian Standard Time',
+          '+4'  => 'Arabian Standard Time',
+          '+5'  => 'Pakistan Standard Time',
+          '+6'  => 'Central Asia Standard Time',
+          '+7'  => 'SE Asia Standard Time',
+          '+8'  => 'China Standard Time',
+          '+9'  => 'Tokyo Standard Time',
+          '+10' => 'E. Australia Standard Time',
+          '+11' => 'Central Pacific Standard Time'
+        }.freeze
+      end
+    end
+  end
+end

data/lib/vagrant-timezone/config.rb

@@ -1,5 +1,4 @@
 require 'vagrant'
-require 'time'
 
 module VagrantPlugins
   module TimeZone
@@ -7,7 +6,7 @@ module VagrantPlugins
     #
     # @!parse class Config < Vagrant::Plugin::V2::Config; end
     class Config < Vagrant.plugin('2', :config)
-      attr_reader :value
+      attr_accessor :value
 
       def initialize
         super
@@ -15,25 +14,21 @@ module VagrantPlugins
         @value = UNSET_VALUE
       end
 
-      def value= value
-        if value == :host
+      def finalize!
+        super
+
+        if @value == UNSET_VALUE
+          @value = nil
+        elsif @value == :host
           # Get the offset of the current timezone of the host. Ruby doesn't reliably
           # detect the named timezone, so we have to use the hour offset. Note that when
           # DST changes, etc, this offset will change.
 
           # We set timezone offset negative to match POSIX standards
           # https://github.com/eggert/tz/blob/master/etcetera
-          @value = sprintf("Etc/GMT%+d", -((Time.zone_offset(Time.now.zone)/60)/60))
-        else
-          @value = value
+          @value = sprintf('Etc/GMT%+d', -(Time.now.utc_offset/3600))
         end
       end
-
-      def finalize!
-        super
-
-        @value = nil if @value == UNSET_VALUE
-      end
     end
   end
 end

data/lib/vagrant-timezone/plugin.rb

@@ -103,6 +103,11 @@ module VagrantPlugins
         require_relative 'cap/redhat'
         Cap::RedHat
       end
+
+      guest_capability 'windows', 'change_timezone' do
+        require_relative 'cap/windows'
+        Cap::Windows
+      end
     end
   end
 end

data/lib/vagrant-timezone/version.rb

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

data/spec/spec_helper.rb

@@ -1,14 +1,3 @@
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  coverage_dir('tmp/coverage')
-  add_filter '/spec/'
-end
-
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect

data/spec/unit/vagrant-timezone/cap/windows_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'vagrant-timezone/cap/windows'
+
+describe VagrantPlugins::TimeZone::Cap::Windows do
+  subject { described_class }
+
+  describe '.timezone_name' do
+    context 'with Etc/GMT format' do
+      it 'returns the timezone name for negative offset' do
+        expect(subject.timezone_name('Etc/GMT-10')).to eq 'Hawaiian Standard Time'
+      end
+
+      it 'returns the timezone name for positive offset' do
+        expect(subject.timezone_name('Etc/GMT+10')).to eq 'E. Australia Standard Time'
+      end
+    end
+
+    context 'with unknown format' do
+      it 'returns the specied timezone unchanged' do
+        expect(subject.timezone_name('UTC')).to eq 'UTC'
+      end
+    end
+  end
+end

data/spec/unit/vagrant-timezone/config_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'vagrant-timezone/config'
+
+describe VagrantPlugins::TimeZone::Config do
+  subject { described_class.new }
+
+  describe '#value' do
+    it 'defaults to nil' do
+      subject.finalize!
+      expect(subject.value).to be(nil)
+    end
+
+    it 'can be set' do
+      subject.value = 'FOO'
+      subject.finalize!
+      expect(subject.value).to eq('FOO')
+    end
+
+    it 'can be set' do
+      subject.value = 'FOO'
+      subject.finalize!
+      expect(subject.value).to eq('FOO')
+    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'))
+      subject.value = :host
+      subject.finalize!
+      expect(subject.value).to eq('Etc/GMT-3')
+    end
+  end
+end

data/vagrant-timezone.gemspec

@@ -6,13 +6,22 @@ require 'vagrant-timezone/version'
 Gem::Specification.new do |spec|
   spec.name          = 'vagrant-timezone'
   spec.version       = VagrantPlugins::TimeZone::VERSION
-  spec.authors       = ['Teemu Matilainen']
-  spec.email         = ['teemu.matilainen@iki.fi']
   spec.description   = 'A Vagrant plugin that configures the time zone of a virtual machine'
   spec.summary       = spec.description
   spec.homepage      = 'http://github.com/tmatilai/vagrant-timezone'
   spec.license       = 'MIT'
 
+  spec.authors = [
+    'Teemu Matilainen',
+    'Kyle Corbitt',
+    'Robert R. Meyer'
+  ]
+  spec.email = [
+    'teemu.matilainen@iki.fi',
+    'kyle@corbt.com',
+    'Blue.Dog.Archolite@gmail.com'
+  ]
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,18 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-timezone
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Teemu Matilainen
+- Kyle Corbitt
+- Robert R. Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the time zone of a virtual machine
 email:
 - teemu.matilainen@iki.fi
+- kyle@corbt.com
+- Blue.Dog.Archolite@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -32,12 +36,15 @@ files:
 - lib/vagrant-timezone/cap/gentoo.rb
 - lib/vagrant-timezone/cap/redhat.rb
 - lib/vagrant-timezone/cap/unix.rb
+- lib/vagrant-timezone/cap/windows.rb
 - lib/vagrant-timezone/config.rb
 - lib/vagrant-timezone/logger.rb
 - 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
 - vagrant-timezone.gemspec
 homepage: http://github.com/tmatilai/vagrant-timezone
 licenses:
@@ -59,9 +66,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 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