vagrant-service-manager 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c1cfb3084c3790bdb1bc2070698601b19a56ea3
-  data.tar.gz: 05b22c8562557317cca756273219122763018ccd
+  metadata.gz: 4049a74d704cc4fdf31f1fe31b438c6d8f15b729
+  data.tar.gz: 1d12088ff7c0f5bf5a2dee49e7bce5cff1a1f539
 SHA512:
-  metadata.gz: ac737cc9e566046cce35f929b0003d8beddc9e6d8833a3bd4ff9e5469ea79f3eea0e9f84af5b95df61002d16cfda1e5d31a28909cf7ddf1bc4d781f51a493162
-  data.tar.gz: 4281dce77a9254ac8751d58bccf67dfac2d0310dfb05eb5fd16efe90357a95352027a25072c001244012a9342b17cf34e8075f4f3f6db31c2959177c83380539
+  metadata.gz: 989478ba129bdb743aa172c4e727b70f7b8b63bb4f7c5e138d352866a4509d5f12e64022db7c34f51b33e52ace299fa6c4739cebc850ed241ac9544d9ab18042
+  data.tar.gz: 97a038503acfe3140a3a95e67c266aa78cf1ab9c40d196c3843b36d265922d66274e58bb1b9552cdfac388c7c614799aa2075c7ca111eedd9ca535de65ffa614

data/CHANGELOG.md

@@ -1 +1,30 @@
 # Changelog
+
+## v0.0.2 Feb 17, 2016
+- Fixes #53: Prep for version v0.0.2
+- Fixes #41: Plugin reports to bring up machine for even help command @navidshaikh
+- Updates CHANGELOG.md @navidshaikh
+- Fix #41: Fixes the check for finding vagrant box state @navidshaikh
+- Adding a version.rb @lalatendumohanty
+- Adding steps to build the plugin using Bundler @lalatendumohanty
+- Update README with quick start steps @navidshaikh
+- Fixes #31: Private key wasn't being sourced for libvirt @bexelbie
+- Add notice when copying certificates @bexelbie
+- `vagrant service-manager env` return all info @bexelbie
+- Fix #4 and #5: Add running machine detection @bexelbie
+- Adding objective to the README @lalatendumohanty
+- Adds links to gemfile and copr build @navidshaikh
+- Adds SPEC file for version 0.0.1 release @navidshaikh
+
+## v0.0.1 Feb 09, 2016
+- Updates the source git repository URL
+- Restructure the lib directory and sources plugin from module
+- Removes unused vagrant password from repository
+- Uses net/scp module instead of scp command
+- Adds a sub-command for configuring docker daemon vagrant-service-manager env docker
+- Ports equivalent functionality of plugin for https://github.com/projectatomic/vagrant-adbinfo
+- Renames the plugin and update the rest of repository
+
+@navidshaikh @bexelbie
+
+## Plugin is forked and extended from [vagrant-adbinfo](https://github.com/projectatomic/vagrant-adbinfo)

data/MAINTAINERS

@@ -1,2 +1,3 @@
 Brian Exelbierd <bexelbie@redhat.com> @bexelbie
 Navid Shaikh <nshaikh@redhat.com> @navidshaikh
+Lalatendu Mohanty <lmohanty@redhat.com> @LalatenduMohanty

data/README.md

@@ -1,17 +1,23 @@
-# vagrant-service-manager Vagrant Plugin
+# vagrant-service-manager
 
-Provide setup information, including environment variables and certificates, required to access services provided by an [Atomic Developer Bundle (ADB)](https://github.com/projectatomic/adb-atomic-developer-bundle).  This plugin makes it easier to use the ADB with host-based tools such as Eclipse and the docker and kubernetes CLI commands.  Details on this usage pattern can be found in the [ADB Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst).
+Provides setup information, including environment variables and certificates, required to access services provided by an [Atomic Developer Bundle (ADB)](https://github.com/projectatomic/adb-atomic-developer-bundle).  This plugin makes it easier to use the ADB with host-based tools such as Eclipse and the docker and kubernetes CLI commands.  Details on this usage pattern can be found in the [ADB Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst).
+
+##Objective
+
+* To provide the user a CLI to configure the [ADB](https://github.com/projectatomic/adb-atomic-developer-bundle) for different use cases and to provide glue between ADB and the user's development environment.
+
+*  Provide users a tool to control and configure the ADB from the developer's workstation without having to `ssh` into it.
 
 The [Atomic Developer Bundle](https://github.com/projectatomic/adb-atomic-developer-bundle) is  Vagrant box that provides a ready-to-use development environment for container applications. With ADB, developers can dive right into producing complex, multi-container applications.
 
 ## Quick Start
 
-1. Install and start the Atomic Developer Bundle (ADB), as [documented](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst) in the ADB project.
-
-2. Install the vagrant-service-manager plugin
+1. Install `vagrant-service-manager` plugin
 
         vagrant plugin install vagrant-service-manager
 
+2. Get the [Vagrantfile](Vagrantfile) and start the ADB using `vagrant up`. [More](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst) documentation on setting up ADB.
+
 3. Run the plugin to get environment variables and certificates
 
         $ vagrant service-manager env docker
@@ -51,3 +57,22 @@ The [Atomic Developer Bundle](https://github.com/projectatomic/adb-atomic-develo
   4. Tag the release commit with a vX.Y.Z tag
 
   5. Create a Github release
+
+###How to build the Vagrant plugin using Bundler
+
+You can also use Bundler to build the plugin and install it manually in your Vagrant environment
+
+```
+git clone this repository and run below commands inside the repository
+
+1. bundle install
+2. bundle exec rake build
+
+You can install the plugin using `vagrant install pkg/<gem name>` command.
+````
+
+## Builds
+
+- Gemfile: https://rubygems.org/gems/vagrant-service-manager
+
+- copr build: https://copr.fedorainfracloud.org/coprs/nshaikh/vagrant-service-manager/builds/

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

@@ -11,13 +11,39 @@ module Vagrant
         'provides the IP address:port and tls certificate file location for a docker daemon'
       end
 
+      def exit_if_machine_not_running
+        # Exit from plugin with status 1 if machine is not running
+        with_target_vms(nil, {:single_target=>true}) do |machine|
+          if machine.state.id != :running then
+            message = <<-eos
+  The virtual machine must be running before you execute this command.
+  Try this in the directory with your Vagrantfile:
+  vagrant up
+              eos
+            @env.ui.info(message)
+            exit 1
+          end
+        end
+      end
+
       def execute
         plugin_name, command, subcommand = ARGV
-        if command == "env" and subcommand == "docker" then
-	        self.execute_docker_info
-    	  else
-	        self.print_help
-    	  end
+        case command
+        when "env"
+            self.exit_if_machine_not_running
+            case subcommand
+            when "docker"
+                self.execute_docker_info
+            when nil
+                self.execute_docker_info
+            else
+                self.print_help
+            end
+        when "help"
+            self.print_help
+        else
+            self.print_help
+        end
       end
 
       def print_help
@@ -54,7 +80,7 @@ $vagrant service-manager env docker
         # this execute the operations needed to print the docker env info
         with_target_vms(nil, {:single_target=>true}) do |machine|
           # Path to the private_key and where we will store the TLS Certificates
-          secrets_path = machine.data_dir
+          secrets_path = File.expand_path("docker", machine.data_dir)
 
           hIP = machine.ssh_info[:host]
           hport = machine.ssh_info[:port]
@@ -79,18 +105,23 @@ $vagrant service-manager env docker
           port = 2376
 
           # First, get the TLS Certificates, if needed
-          if !File.directory?(File.expand_path(".docker", secrets_path)) then
+          if !File.directory?(secrets_path) then
 
             # Regenerate the certs and restart docker daemon in case of the new ADB box and for VirtualBox provider
             if machine.provider_name == :virtualbox then
-              hprivate_key_path = machine.ssh_info[:private_key_path][0]
               # `test` checks if the file exists, and then regenerates the certs and restart the docker daemon, else do nothing.
               command2 = "test ! -f /opt/adb/cert-gen.sh || (sudo rm /etc/docker/ca.pem && sudo systemctl restart docker)"
               machine.communicate.execute(command2)
             end
 
+            # Get the private key
+            hprivate_key_path = machine.ssh_info[:private_key_path][0]
+
             # copy the required client side certs from inside the box to host machine
-            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker", "#{secrets_path}")
+            @env.ui.info("# Copying TLS certificates to #{secrets_path}")
+            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker/ca.pem", "#{secrets_path}")
+            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker/cert.pem", "#{secrets_path}")
+            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker/key.pem", "#{secrets_path}")
           end
 
           # display the information, irrespective of the copy operation
@@ -101,9 +132,6 @@ $vagrant service-manager env docker
       def print_info(guest_ip, port, secrets_path, machine_uuid)
         # Print configuration information for accesing the docker daemon
 
-        # extending the .docker path to include
-        secrets_path = File.expand_path(".docker", secrets_path)
-
         if !OS.windows? then
           message =
           <<-eos

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

@@ -0,0 +1,5 @@
+module Vagrant
+  module ServiceManager
+    VERSION = "0.0.2"
+  end
+end

data/vagrant-service-manager.gemspec

@@ -1,6 +1,9 @@
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+require 'vagrant-service-manager/version'
+
 Gem::Specification.new do |spec|
   spec.name          = 'vagrant-service-manager'
-  spec.version       = '0.0.1'
+  spec.version       = Vagrant::ServiceManager::VERSION
   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."
 

data/vagrant-service-manager.spec

@@ -2,11 +2,11 @@
 %global vagrant_plugin_name vagrant-service-manager
 
 Name: %{vagrant_plugin_name}
-Version: 0.0.1
+Version: 0.0.2
 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 
+License: GPLv2
 URL: https://github.com/bexelbie/vagrant-service-manager
 Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem
 Requires(posttrans): vagrant
@@ -14,7 +14,7 @@ Requires(preun): vagrant
 Requires: vagrant
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel >= 1.3.6
-BuildRequires: ruby 
+BuildRequires: ruby
 BuildRequires: vagrant
 BuildArch: noarch
 Provides: vagrant(%{vagrant_plugin_name}) = %{version}
@@ -82,7 +82,24 @@ popd
 %{vagrant_plugin_instdir}/vagrant-service-manager.gemspec
 %{vagrant_plugin_instdir}/vagrant-service-manager.spec
 %{vagrant_plugin_instdir}/CHANGELOG.md
+%{vagrant_plugin_instdir}/TODO
 
 %changelog
-* Fri Jan 22 2016 Navid Shaikh - 0.0.1-1
+* Tue 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
+
+* Thu Feb 09 2016 Navid Shaikh - 0.0.1-1
 - Initial build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ files:
 - lib/vagrant-service-manager/command.rb
 - lib/vagrant-service-manager/os.rb
 - lib/vagrant-service-manager/plugin.rb
+- lib/vagrant-service-manager/version.rb
 - vagrant-service-manager.gemspec
 - vagrant-service-manager.spec
 homepage: https://github.com/projectatomic/vagrant-service-manager