vagrant-service-manager 1.1.0 → 1.2.0

data/test/vagrant-service-manager/installer_test.rb

@@ -0,0 +1,96 @@
+require_relative '../test_helper'
+
+module VagrantPlugins
+  module ServiceManager
+    describe Installer do
+      before do
+        @machine = fake_machine
+        @ui = FakeUI.new
+        @machine.env.stubs(:ui).returns(@ui)
+
+        # set test path
+        @plugin_test_path = "#{@machine.env.data_dir}/service-manager/test"
+        ServiceManager.bin_dir = "#{@plugin_test_path}/bin"
+        ServiceManager.temp_dir = "#{@plugin_test_path}/temp"
+      end
+
+      after do
+        FileUtils.rmtree(@plugin_test_path) if File.directory? @plugin_test_path
+      end
+
+      describe 'Docker' do
+        before do
+          @type = :docker
+          @options = { box_version: 'adb', '--cli-version' => '1.11.0' }
+          @installer = Installer.new(@type, @machine, @machine.env, @options)
+        end
+
+        it 'should set default values properly' do
+          @installer.instance_variable_get('@type').must_equal @type
+          @installer.instance_variable_get('@machine').must_equal @machine
+          @installer.instance_variable_get('@env').must_equal @machine.env
+          @installer.instance_variable_get('@box_version').must_equal 'adb'
+        end
+
+        it 'should build handler class dynamically' do
+          @installer.handler_class.must_equal ADBDockerBinaryHandler.to_s
+        end
+
+        it 'should skip installing if binary path exists' do
+          # create mock docker binary
+          bin_folder_path = "#{ServiceManager.bin_dir}/docker/#{@options['--cli-version']}"
+          FileUtils.mkdir_p(bin_folder_path)
+          FileUtils.touch("#{bin_folder_path}/docker")
+
+          @installer.instance_variable_get('@binary_handler').binary_exists.must_equal true
+        end
+      end
+
+      describe 'OpenShift' do
+        before do
+          @type = :openshift
+          @options = { box_version: 'adb', '--cli-version' => '1.2.0' }
+          @installer = Installer.new(@type, @machine, @machine.env, @options)
+        end
+
+        it 'should set default values properly' do
+          @installer.instance_variable_get('@type').must_equal @type
+          @installer.instance_variable_get('@machine').must_equal @machine
+          @installer.instance_variable_get('@env').must_equal @machine.env
+          @installer.instance_variable_get('@box_version').must_equal 'adb'
+        end
+
+        it 'should build handler class dynamically' do
+          @installer.handler_class.must_equal ADBOpenshiftBinaryHandler.to_s
+        end
+
+        it 'should skip installing if binary path exists' do
+          # create mock docker binary
+          bin_folder_path = "#{ServiceManager.bin_dir}/openshift/#{@options['--cli-version']}"
+          FileUtils.mkdir_p(bin_folder_path)
+          FileUtils.touch("#{bin_folder_path}/oc")
+
+          @installer.instance_variable_get('@binary_handler').binary_exists.must_equal true
+        end
+      end
+
+      describe 'Kubernetes' do
+        before do
+          @type = :kubernetes
+          @options = { box_version: 'adb' }
+        end
+
+        it 'should exit' do
+          begin
+            Installer.new(@type, @machine, @machine.env, @options)
+            refute(true, 'Installer should have exited')
+          rescue SystemExit => e
+            e.status.must_equal 126 # exited with failure status
+          end
+          @ui.received_info_messages.must_include 'Installation of Kubernetes client library via the install-cli ' \
+                                                  'command is not supported yet.'
+        end
+      end
+    end
+  end
+end

data/vagrant-service-manager.gemspec

@@ -6,13 +6,14 @@ Gem::Specification.new do |spec|
   spec.version       = VagrantPlugins::ServiceManager::VERSION
   spec.license       = 'GPL-2.0'
   spec.homepage      = 'https://github.com/projectatomic/vagrant-service-manager'
-  spec.summary       = "To provide the user a CLI to configure the ADB/CDK for different use cases and to provide glue between ADB/CDK and the user's developer environment."
-  spec.description   = "Provides setup information, including environment variables and certificates, required to access services provided by ADB/CDK."
+  spec.summary       = 'To provide the user a CLI to configure the ADB/CDK for different use cases and to provide '\
+                        'glue between ADB/CDK and the user\'s developer environment.'
+  spec.description   = 'Provides setup information, including environment variables and certificates, required to '\
+                        'access services provided by ADB/CDK.'
 
   spec.authors       = ['Brian Exelbierd', 'Navid Shaikh']
   spec.email         = ['bex@pobox.com', 'nshaikh@redhat.com']
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ['lib']
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies: []
 description: Provides setup information, including environment variables and certificates,
   required to access services provided by ADB/CDK.
@@ -20,13 +20,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ci/ansible/roles/centos/tasks/main.yml"
-- ".ci/ansible/roles/centos/vars/main.yml"
-- ".ci/ansible/site.yml"
-- ".ci/jenkins-execute-script.py"
-- ".config/cucumber.yml"
-- ".gitattributes"
-- ".gitignore"
+- .ci/ansible/roles/centos/tasks/main.yml
+- .ci/ansible/roles/centos/vars/main.yml
+- .ci/ansible/site.yml
+- .ci/jenkins-execute-script.py
+- .config/cucumber.yml
+- .gitattributes
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
 - CHANGELOG.md
 - CONTRIBUTING.adoc
 - Gemfile
@@ -34,23 +36,32 @@ files:
 - MAINTAINERS
 - README.adoc
 - Rakefile
-- TODO
-- Vagrantfile
 - features/box-command.feature
 - features/env-command.feature
 - features/help-command.feature
+- features/install-cli.feature
 - features/openshift.feature
 - features/service-operation.feature
 - features/support/env.rb
 - lib/vagrant-service-manager.rb
 - lib/vagrant-service-manager/action/setup_network.rb
+- lib/vagrant-service-manager/archive_handlers/tar_handler.rb
+- lib/vagrant-service-manager/archive_handlers/zip_handler.rb
+- lib/vagrant-service-manager/binary_handlers/adb_binary_handler.rb
+- lib/vagrant-service-manager/binary_handlers/adb_docker_binary_handler.rb
+- lib/vagrant-service-manager/binary_handlers/adb_openshift_binary_handler.rb
+- lib/vagrant-service-manager/binary_handlers/binary_handler.rb
+- lib/vagrant-service-manager/binary_handlers/cdk_binary_handler.rb
+- lib/vagrant-service-manager/binary_handlers/cdk_docker_binary_handler.rb
+- lib/vagrant-service-manager/binary_handlers/cdk_openshift_binary_handler.rb
 - lib/vagrant-service-manager/command.rb
 - lib/vagrant-service-manager/config.rb
-- lib/vagrant-service-manager/os.rb
+- lib/vagrant-service-manager/installer.rb
 - lib/vagrant-service-manager/plugin.rb
 - lib/vagrant-service-manager/plugin_logger.rb
 - lib/vagrant-service-manager/plugin_util.rb
 - lib/vagrant-service-manager/service.rb
+- lib/vagrant-service-manager/service_base.rb
 - lib/vagrant-service-manager/services/docker.rb
 - lib/vagrant-service-manager/services/kubernetes.rb
 - lib/vagrant-service-manager/services/open_shift.rb
@@ -61,8 +72,24 @@ files:
 - plugins/guests/redhat/cap/os_variant.rb
 - plugins/guests/redhat/cap/sha_id.rb
 - plugins/guests/redhat/plugin.rb
+- plugins/hosts/darwin/cap/os_arch.rb
+- plugins/hosts/darwin/plugin.rb
+- plugins/hosts/linux/cap/os_arch.rb
+- plugins/hosts/linux/plugin.rb
+- plugins/hosts/windows/cap/os_arch.rb
+- plugins/hosts/windows/plugin.rb
+- test/test_data/docker-1.10.0.tar.gz
+- test/test_data/docker-1.11.0.tgz
+- test/test_data/docker-1.9.1.zip
+- test/test_data/openshift-origin-client-tools-v1.2.0-2e62fab-linux-64bit.tar.gz
+- test/test_data/openshift-origin-client-tools-v1.2.0-2e62fab-linux-64bit.zip
+- test/test_data/openshift-origin-client-tools-v1.2.0-2e62fab-mac.zip
+- test/test_helper.rb
+- test/vagrant-service-manager/archive_handler_test.rb
+- test/vagrant-service-manager/binary_handlers/adb_docker_binary_handler_test.rb
+- test/vagrant-service-manager/binary_handlers/adb_openshift_binary_handler_test.rb
+- test/vagrant-service-manager/installer_test.rb
 - vagrant-service-manager.gemspec
-- vagrant-service-manager.spec
 homepage: https://github.com/projectatomic/vagrant-service-manager
 licenses:
 - GPL-2.0
@@ -73,17 +100,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.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: To provide the user a CLI to configure the ADB/CDK for different use cases

data/TODO

@@ -1,24 +0,0 @@
-TODO for provisioner:
-
-Vagrantfile should look like
-
-
-```
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-  config.vm.box = "projectatomic/adb"
-
-  config.vm.network "private_network", type: "dhcp"
-
-  config.service-manager.enable = "docker"
-  config.service-manager.enable = "openshift"
-
-end
-```
-
-
-Aim of above Vagrantfile:
-  - Enable the docker service in provisioning step : "systemctl restart docker"
-  - Enable the openshift service in provisioning step: "systemctl restart openshift"

data/Vagrantfile

@@ -1,29 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-unless Vagrant.has_plugin?("vagrant-service-manager")
-  $stderr.puts <<-MSG
-    vagrant-service-manager plugin is required for projectatomic/adb.
-    Kindly install the plugin: `$ vagrant plugin install vagrant-service-manager`
-  MSG
-  exit 126
-end
-
-Vagrant.configure(2) do |config|
-
-  config.vm.box = "projectatomic/adb"
-
-  #config.vm.network "private_network", ip: "192.168.33.10"
-  #config.vm.network "private_network", type: "dhcp"
-
-  # This is the default setup
-  # config.servicemanager.services = 'docker'
-
-  # Enable multiple services as comma separated list.
-  # config.servicemanager.services = 'docker, openshift'
-
-  # Specific versions can be specified using the following variables for OpenShift service:
-  # config.servicemanager.openshift_docker_registry = "docker.io"
-  # config.servicemanager.openshift_image_name = "openshift/origin"
-  # config.servicemanager.openshift_image_tag = "v1.1.1"
-end

data/lib/vagrant-service-manager/os.rb

@@ -1,22 +0,0 @@
-# OS Module
-module OS
-  def self.windows?
-    (/mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-  end
-
-  def self.windows_cygwin?
-    (/cygwin/ =~ ENV["VAGRANT_DETECTED_OS"]) != nil
-  end
-
-  def self.mac?
-    (/darwin/ =~ RUBY_PLATFORM) != nil
-  end
-
-  def self.unix?
-    !windows?
-  end
-
-  def self.linux?
-    unix? && !mac?
-  end
-end

data/vagrant-service-manager.spec

@@ -1,215 +0,0 @@
-# Generated from vagrant-service-manager-0.0.4.gem by gem2rpm -*- rpm-spec -*-
-%global vagrant_plugin_name vagrant-service-manager
-
-Name: %{vagrant_plugin_name}
-Version: 1.1.0
-Release: 1%{?dist}
-Summary: To provide the user a CLI to configure the ADB/CDK for different use cases and to provide glue between ADB/CDK and the user's developer environment.
-Group: Development/Languages
-License: GPLv2
-URL: https://github.com/projectatomic/vagrant-service-manager
-Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem
-Requires(posttrans): vagrant
-Requires(preun): vagrant
-Requires: vagrant
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel >= 1.3.6
-BuildRequires: ruby
-BuildRequires: vagrant
-BuildArch: noarch
-Provides: vagrant(%{vagrant_plugin_name}) = %{version}
-
-%description
-To provide the user a CLI to configure the ADB/CDK for different use cases and to provide glue between ADB/CDK and the user's developer environment.
-
-%package doc
-Summary: Documentation for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description doc
-Documentation for %{name}.
-
-%prep
-gem unpack %{SOURCE0}
-
-%setup -q -D -T -n  %{vagrant_plugin_name}-%{version}
-
-gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec
-
-%build
-# Create the gem as "gem install" only works on a gem file
-gem build %{vagrant_plugin_name}.gemspec
-
-# %%vagrant_plugin_install compiles any C extensions and installs the gem into ./%%gem_dir
-# by default, so that we can move it into the buildroot in %%install
-%vagrant_plugin_install
-
-%install
-mkdir -p %{buildroot}%{vagrant_plugin_dir}
-cp -a .%{vagrant_plugin_dir}/* \
-        %{buildroot}%{vagrant_plugin_dir}/
-
-# Run the test suite
-%check
-pushd .%{vagrant_plugin_instdir}
-
-popd
-
-%posttrans
-%vagrant_plugin_register %{vagrant_plugin_name}
-
-%preun
-%vagrant_plugin_unregister %{vagrant_plugin_name}
-
-%files
-%dir %{vagrant_plugin_instdir}
-%exclude %{vagrant_plugin_instdir}/.gitignore
-%{vagrant_plugin_libdir}
-%exclude %{vagrant_plugin_cache}
-%{vagrant_plugin_spec}
-%{vagrant_plugin_instdir}/plugins/guests/
-%{vagrant_plugin_instdir}/locales/
-%exclude %{vagrant_plugin_instdir}/.ci
-%exclude %{vagrant_plugin_instdir}/.config
-
-%files doc
-%doc %{vagrant_plugin_docdir}
-%{vagrant_plugin_instdir}/Gemfile
-%doc %{vagrant_plugin_instdir}/README.adoc
-%{vagrant_plugin_instdir}/Rakefile
-%{vagrant_plugin_instdir}/Vagrantfile
-%{vagrant_plugin_instdir}/CONTRIBUTING.adoc
-%{vagrant_plugin_instdir}/LICENSE
-%{vagrant_plugin_instdir}/MAINTAINERS
-%{vagrant_plugin_instdir}/vagrant-service-manager.gemspec
-%{vagrant_plugin_instdir}/vagrant-service-manager.spec
-%{vagrant_plugin_instdir}/CHANGELOG.md
-%{vagrant_plugin_instdir}/TODO
-%{vagrant_plugin_instdir}/.gitattributes
-%{vagrant_plugin_instdir}/features
-
-%changelog
-* Wed Jun 08 2016 Navid Shaikh - 1.1.0-1
-- Bumps verison to 1.1.0
-- Updated README to make Installation Instructions clearer @bexelbie
-- Fix #195: Adding Cucumber and Aruba based acceptance tests @hferentschik
-- CHANGELOG fix and README update for OS support for tests @budhrg
-- Fix #220: Bypass hook if no supported guest/box found @budhrg
-- Issue #212 Updating the CONTRIBUTING page with latest guidelines @hferentschik
-- Fix #188: Name of k8s service not consistent @budhrg
-- Fix #225: service-manager env throws NameError @budhrg
-- Fix #168: Extend --debug flag to show plugin activity @budhrg
-- Fixed help messages for box and status commands @budhrg
-- Don't set private network for unsupported box @budhrg
-- Convert CONTRIBUTING and README docs to AsciiDoc @bexelbie
-- Fix #235: Unable to access docker daemon from host @navidshaikh
-- Fix #172: Implement "start/enable" service command @budhrg
-- Issue #172 Modifying Rake CDK download task to allow downloading latest nightly build @hferentschik
-- Pre-release v1.1.0.beta.1 @navidshaikh
-- Fix #237: README and CONTRIBUTING should make use of Asciidoc's :toc: feature @hferentschik
-- Fix #230: Improve acceptance test run time @hferentschik
-- Fix #214: Update acceptance tests to support Mac OS without installing Libvirt @hferentschik
-- Fix #247: Moved status test into service-operation @hferentschik
-- Issue #211 Adding configuration for CI build @hferentschik
-- Fix #210: Adds docker registry URL in openshift env info @navidshaikh
-- Fix #250: status throws error with invalid service name @budhrg
-- vagrant-service-manager release=1.1.0 version=1 @navidshaikh
-
-* Mon May 09 2016 Navid Shaikh - 1.0.2-1
-- Add --script-readable to env and env docker @bexelbie
-- Fix #178: Add status command and separate status from env @bexelbie
-- Fix#173: Shows if kubernetes services is running in the box @navidshaikh
-- Fix #169: Adds command for displaying box routable IP address @navidshaikh
-- Fix message for box command on default help @budhrg
-- Fix #184: Make env headers comments for vagrant service-manager env @bexelbie
-- Fix #135: Refactor command.rb to make commands easier to add/maintain @budhrg
-- Adds @budhrg as co-maintainer for the plugin @navidshaikh
-- Fix #191: 'vagrant service-manager restart' not handled correctly @budhrg
-- Fixes #187, Updated commands in the Available Commands section @preeticp
-- Fix #200: Simplify the eval hint for `vagrant service-manager env` command @budhrg
-- Add environment variables for Openshift env output @bexelbie
-- Fix #181: vagrant-service-manager version 1.0.2 release @navidshaikh
-
-* Tue Apr 12 2016 Navid Shaikh - 1.0.1-1
-- Updated SPEC (v1.0.0) for url, date and format @budhrg
-- Added Table of Contents for README @bexelbie
-- Fix #160: "vagrant service-manager restart openshift" not working as expected @budhrg
-- Fix #166: For CDK box, provisioners are not executed by default on Vagrant up @budhrg
-- Fix #170: vagrant-service-manager version 1.0.1 release @navidshaikh
-
-* Thu Apr 7 2016 Navid Shaikh - 1.0.0-1
-- Bumps the plugin version to 1.0.0
-- Fix #132: vagrant-service-manager 1.0.0 release @navidshaikh
-- Fix #133: Adds restart command for services @navidshaikh
-- Fix #152: Makes plugin backward compatible with docker 1.8.2 for docker version API @navidshaikh
-- Fix #150: Adds .gitattributes to fix the CHANGELOG.md merge conflicts @bexelbie
-- Fix #142: Removes # before human readable output of openshift env info @navidshaikh
-- Fix #75 and #141: Improves `vagrant service-manager env` output @navidshaikh
-- Fix #146: Updates docker 1.9.1 API call for `docker version` @navidshaikh
-- Updating CONTRIBUTING with note about entry loc @bexelbie
-- Update IP detection routine and fix for libvirt @bexelbie
-- Fix #50: Add --help @budhrg
-- Fix #89: Improve help output for service-manager -h @budhrg
-- Vagrant way of showing information using 'locale' @budhrg
-- cygwin eval hint now removes colors and env uses export @bexelbie
-- Fix #131: Fixes starting OpenShift service by default for CDK box @navidshaikh
-
-* Tue Mar 29 2016 Navid Shaikh - 0.0.5-1
-- Fix #127: vagrant-service-manager 0.0.5 release @navidshaikh
-- Fix #122: Certs copied at the time of generation @budhrg
-- Fix #121: Removes DOCKER_MACHINE_NAME from `env docker` command output @navidshaikh
-- Fix #65: Adds --script-readable option for `env openshift` command @navidshaikh
-- Fix #80: Check for correct TLS certs pair @budhrg
-- Fix #113: Adds DOCKER_API_VERSION in env docker output @navidshaikh
-- Adds SPEC file version 0.0.4 of the plugin @navidshaikh
-
-* Tue Mar 15 2016 Navid Shaikh - 0.0.4-1
-- Fix #101: vagrant-service-manager version 0.0.4 release @navidshaikh
-- Remove manually scp for TLS keys and use machine.communicate.download @bexelbie
-- Fix #87 #83: Supports starting OpenShift service as part of config @budhrg @bexelbie @navidshaikh
-- Fix #95: Update hook code to call other middleware first @bexelbie
-- Fix #94: Do not exit if box is not supported @navidshaikh
-- Fixed missing word for plugin installation in README @budhrg
-- Fix links, typos, formatting in CONTRIBUTING.md @budhrg
-- Fix #16 and #72: Enable private networking for VirtualBox if not set @budhrg
-
-* Tue Mar 01 2016 Navid Shaikh - 0.0.3-1
-- Fix #74: vagrant-service-manager plugin version 0.0.3 release @navidshaikh
-- Fix #12 and #21: Restart docker service on 'vagrant up' @budhrg
-- Update CONTRIBUTING.md and README.md @bexelbie
-- Fix #45: Adds exit status for commands and invalid commands @navidshaikh
-- Enhanced the developer instructions for developing the plugin in README @budhrg
-- Updated box versioning info @budhrg
-- Fix #45: Adds exit status for commands and invalid commands @navidshaikh
-- Renames the option machine-readable to script-readable @navidshaikh
-- Fix #63: Adds --machine-readable option to box version command @navidshaikh
-- Fix #66: Fixing gem build warning @lalatendumohanty
-- Adds the filename as class constant @navidshaikh
-- Fix #8: Adds subcommand for printing box version
-- Fix #59: Prints the error message on stderr @navidshaikh
-- Updates openshift connection information output @navidshaikh
-- Extends help command with openshift example @navidshaikh
-- Adds method to find if a service is running @navidshaikh
-- Fix #23: Adds subcommand for displaying openshift information @navidshaikh
-- Updates output docker info in README @navidshaikh
-
-* Wed Feb 17 2016 Navid Shaikh - 0.0.2-1
-- Bumps version to v0.0.2
-- Fixed prompting for bringing machine up for help command
-- Adds Lalatendu Mohanty as maintainer
-- Fixed check for finding vagrant box state
-- Adds version.rb to fetch the version of plugin
-- Adds steps to build the plugin using bundler
-- Updates README with quick start steps
-- Fixed issue for private key not being sourced for libvirt provider
-- Add notice when copying certificates
-- `vagrant service-manager env` returns all info
-- Adds running machine detection in plugin for better error reporting
-- Updates README with objective
-- Updates README with gemfile and copr builds
-- Added SPEC file to the git repository of plugin
-
-* Tue Feb 09 2016 Navid Shaikh - 0.0.1-1
-- Initial build