vagrant-flow 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ae05bd8a76968202c2f7b192ff4be321dba616
-  data.tar.gz: 5c0146d7b066532bc95502878518749214fb7070
+  metadata.gz: dc061965ed315eecc3e16616e72fbd129471dc64
+  data.tar.gz: 3d1ea1a4d6c64bf2100d99a25427096b20bc4483
 SHA512:
-  metadata.gz: cc6d35e04599c523066023780e4207f180f4b2bf8203cfd71af01224cbf8edb011a63b37ccf58cfc98914da025ff9c773887edaccd46d6679dc3319f6929e947
-  data.tar.gz: 3a913c6296071c810a9cffe33d07aa5e72a37605165f5bc4645db5168d089a2de6d1230f27a09c2531cb90d1459f645fe7f838f509de7ad78e32e32600f0d79c
+  metadata.gz: 1c374f2cb3f3704bfdf4e679b59f4a396ff93de6641445653b39b8d5e219108c367227aa8424051b0d162e2460d7c712d0a57724857eccaef030f7d7dc0c5771
+  data.tar.gz: 0ea1608f46182c7627e461747c5f2d2a5c70c7f2360592050cdca184cbb49f29062530c1ea83ebc1d2715d8a7b1a9d253f9659b7d7c348579ff6b1cc5e060250

data/README.md

@@ -40,7 +40,8 @@ ansibleinventory
 playbook
 multicommand
 ```
-
+- installdotoken
+  - Installs your digital ocean token to be able to use the digital ocean provider
 - multiinit
   - Creates a template Vagrantfile based on the machines you specify
 - hostfile
@@ -55,6 +56,7 @@ multicommand
 Example flow to be enabled
 ```
 vagrant plugin install vagrant-flow
+vagrant flow installdotoken -t xxxxxyyyyyyzzzz123
 git clone http://github.com/DemandCube/DeveloperPlaybooks
 mkdir devsetup
 cd devsetup
@@ -85,6 +87,19 @@ Publically available boxes in vagrantcloud from DemandCube:
 
 # Usage
 
+* * *
+##installdotoken
+Usage: vagrant flow multicommand [-qf] -c COMMAND
+Installs your digital ocean key for easy vagrant-flow configuration
+
+    -q, --quiet                      (Optional) Suppress output to STDOUT and STDERR
+    -t, --token TOKEN                (REQUIRED) The token to install
+    -h, --help                       Print this help
+
+Example:  This will isntall your token to ~/.vagrant-flow for use in other plugins
+```
+vagrant flow installdotoken -t abcddefjdaj1243
+```
 
 * * *
 ## multiinit
@@ -158,11 +173,6 @@ Details on [vagrant-digitalocean](https://github.com/smdahlen/vagrant-digitaloce
 :sshPrivateKeyPath: ~/.ssh/id_rsa
 
 
-#The digitalOceanToken must be set for digitalocean to work.  You can generate one at https://cloud.digitalocean.com/settings/applications
-#Omit it if you don't want digitalocean as a provider option in your vagrantfile
-:digitalOceanToken: xxxxxxxxxxxxxxyyyyyyyzzzzz988765445678765
-
-
 :intnetName: neverwinterDP
 machines:
   #Create a box with all defaults set for you
@@ -215,32 +225,12 @@ This will look through your vagrantfile config, find all the hostnames and IP's
 vagrant flow hostfile
 ```
 
-This will make an API call to digital ocean (https://developers.digitalocean.com/droplets/), retrieve your list of hostnames and Ip's, and append that information retrieved from DO to the VM's hosts file specified in your Vagrantfile. The config file it will look for by default is the same as the file for multiinit - multiinitconfig.yml
+This will make an API call to digital ocean (https://developers.digitalocean.com/droplets/), retrieve your list of hostnames and Ip's, and append that information retrieved from DO to the VM's hosts file specified in your Vagrantfile.
+This option requires you first run vagrant flow installdotoken -t [your token here]
 ```
 vagrant flow hostfile -d
 ```
 
-Example Vagrantfile excerpt.  This configuration is required by hostfile to be able to determine IP addresses and hostnames.
-If you're already using vagrant flow multiinit, then this configuration is already take care of
-```
-  config.vm.define :server1 do | server1 |
-    server1.vm.box = "demandcube/centos-65_x86_64-VB-4.3.8"
-    # Create a private network
-    server1.vm.network :private_network, ip: "192.168.1.2", virtualbox__intnet: "neverwinterDP"
-    server1.vm.hostname = "server1"
-  end
-
-  config.vm.define :server2 do | server2 |
-    server2.vm.box = "demandcube/centos-65_x86_64-VB-4.3.8"
-    # Create a private network
-    server2.vm.network :private_network, ip: "192.168.1.3", virtualbox__intnet: "neverwinterDP"
-    server2.vm.hostname = "server2"
-  end
-```
-
-Refer to multiinit for how to set your digital ocean token
-To find your digital ocean token, log into digital ocean, and visit https://cloud.digitalocean.com/api_access
-
 * * *
 ## ansibleinventory
 ```

data/lib/vagrant-flow/command/getDOtoken.rb

@@ -0,0 +1,26 @@
+require 'yaml'
+
+##Example usage:
+##Require my library for talking to digitalocean
+##require File.expand_path(File.dirname(__FILE__) ) +"/getDOToken"
+##puts GetDOToken.getToken()
+
+class GetDOToken
+    
+    #Returns digital ocean token that's been installed
+    #Returns nil if its not present
+    def self.getToken()
+      filename = ENV['HOME']+"/.vagrant-flow"
+      if File.exists?(filename)
+        x =  YAML::load_file(filename)
+        if x.has_key?(:digitalOceanToken)
+           return x[:digitalOceanToken]
+        end
+      end
+      return nil
+    end
+end
+
+
+
+

data/lib/vagrant-flow/command/hostfile.rb

@@ -6,6 +6,9 @@ require 'yaml'
 #Require my library for talking to digitalocean
 require File.expand_path(File.dirname(__FILE__) ) +"/digitalocean_api"
 
+#Require my library for grabbing installed DO Token
+require File.expand_path(File.dirname(__FILE__) ) +"/getDOToken"
+
 module VagrantPlugins
   module CommandVagrantFlow
     module Command
@@ -30,7 +33,6 @@ module VagrantPlugins
           options[:nowrite] = false
           options[:quiet] = false
           options[:digitalocean] = false
-          options[:digitalocean_file] = "multiinitconfig.yml"
 
           #Parse option, look up OptionParser documentation
           opts = OptionParser.new do |o|
@@ -52,9 +54,6 @@ module VagrantPlugins
               options[:digitalocean] = true
             end
             
-            o.on("-o", "--digitaloceanfile FILE", "(Optional) File to read in for -d option instead of multiinitconfig.yml") do |f|
-              options[:digitalocean_file] = f
-            end
           end
           argv = parse_options(opts)
           return if !argv
@@ -65,9 +64,8 @@ module VagrantPlugins
           #Go through config
           #Map hostnames to IP's
           if options[:digitalocean]
-            config = YAML.load_file(options[:digitalocean_file])
             digitalocean = DigitalOcean_Api.new()
-            hostinfo = digitalocean.getHostNamesAndIps(config[:digitalOceanToken])
+            hostinfo = digitalocean.getHostNamesAndIps(GetDOToken.getToken())
           else
             with_target_vms(argv, :provider => options[:provider]) do |machine|
               return unless machine.communicate.ready?

data/lib/vagrant-flow/command/installDOToken.rb

@@ -0,0 +1,88 @@
+require "vagrant"
+require 'optparse'
+require 'yaml'
+
+
+module VagrantPlugins
+  module CommandVagrantFlow
+    module Command
+      class InstallDOToken < Vagrant.plugin("2", :command)
+        
+        # Builtin from Command class
+        # Must override to provide a description
+        def self.synopsis
+          "Installs your digital ocean key to ~/.vagrant-flow"
+        end
+
+        def commandThread(machine,command, quiet)
+          begin
+            machine.communicate.execute(command)
+            if !quiet
+              puts "Command was ran successfully on: "+machine.config.vm.hostname
+            end
+          rescue
+            if !quiet
+              puts "Command FAILED on: "+machine.config.vm.hostname
+              @error_message="#{$!}"
+              puts @error_message
+            end
+          ensure
+            if !quiet
+              puts "----"
+            end
+          end
+        end
+        
+        # Builtin from Command class
+        # Must override to provide core functionality
+        def execute
+          options = {}
+          options[:destroy_on_error] = true
+          options[:parallel] = false
+          options[:provision_ignore_sentinel] = false
+          options[:quiet] = false
+          options[:token] = nil
+
+          opts = OptionParser.new do |o|
+            o.banner = "A NeverWinterDP technology from the Department of Badass.\n\n"+
+                        "Usage: vagrant flow multicommand [-q] -t TOKEN\n"+
+                        "Installs your digital ocean key for easy vagrant-flow configuration"
+            o.separator ""
+
+            o.on("-q", "--quiet", "(Optional) Suppress output to STDOUT and STDERR") do |f|
+              options[:quiet] = true
+            end
+            
+            o.on("-t", "--token TOKEN", "(REQUIRED) The token to install") do |f|
+              options[:token] = f
+            end
+          end
+          
+          argv = parse_options(opts)
+          return if !argv
+          raise OptionParser::MissingArgument if options[:token].nil?
+          x = {
+            :digitalOceanToken=>options[:token],
+          }
+          
+          filename = ENV['HOME']+"/.vagrant-flow"
+          begin
+            File.open(filename, 'w') { |file| file.write (x.to_yaml ) }
+            if !options[:quiet]
+              puts "Success!"
+            end
+          rescue
+            if !options[:quiet]
+              @error_message="#{$!}"
+              $stderr.puts "Could not write to "+filename
+              $stderr.puts @error_message
+            end
+          end
+          
+          
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-flow/command/multiinit.rb

@@ -4,6 +4,9 @@ require "yaml"
 require 'erubis'
 require "ipaddr"
 
+#Require my library for grabbing installed DO Token
+require File.expand_path(File.dirname(__FILE__) ) +"/getDOToken"
+
 module VagrantPlugins
   module CommandVagrantFlow
     module Command
@@ -138,6 +141,12 @@ module VagrantPlugins
             return
           end
           
+          #Set digitalocean token if its installed
+          token= GetDOToken.getToken()
+          if ! token.nil?
+            content[:digitalOceanToken] = token
+          end
+          
           #Set IP's for private network
           #Start at 192.168.1.0 and increment up
           #using the IPAddr class

data/lib/vagrant-flow/command/root.rb

@@ -38,6 +38,12 @@ module VagrantPlugins
             require_relative "multicommand"
             MultiCommand
           end
+
+          @subcommands.register(:installdotoken) do
+            require_relative "installdotoken"
+            InstallDOToken
+          end
+          
         end
 
         def execute

data/lib/vagrant-flow/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantFlow
-    VERSION = "1.0.26"
+    VERSION = "1.0.27"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Steve Morin
@@ -59,7 +59,9 @@ files:
 - lib/vagrant-flow.rb
 - lib/vagrant-flow/command/ansibleinventory.rb
 - lib/vagrant-flow/command/digitalocean_api.rb
+- lib/vagrant-flow/command/getDOtoken.rb
 - lib/vagrant-flow/command/hostfile.rb
+- lib/vagrant-flow/command/installDOToken.rb
 - lib/vagrant-flow/command/multicommand.rb
 - lib/vagrant-flow/command/multiinit.rb
 - lib/vagrant-flow/command/playbook.rb