vbuilder 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2c096d5809db31685967a6564081324d2e9385
-  data.tar.gz: 5d6c805ab4932507b407d7ae87de1339b15f1488
+  metadata.gz: e7cb201309103e4e38714ff8e06ab7dea0c80af4
+  data.tar.gz: a42ee5e45c572d8e94ce1532f8053590574a6d14
 SHA512:
-  metadata.gz: 37b772fd5210010754c130cf83d9d8466acdeba458e9a9a7ee88892927919f5b0f563f6bcbbadc81166069e647d3b4fc54c8c0e8c4fc9bd48db7ea37d7ee60eb
-  data.tar.gz: 8fa1124db62621a2b5c05a4837d3ab73fc1b49c2c1f9b37299ee0885d5d1815994d0eb88827c7e6f34d9d9db766bd247f4b0242b5796148ab3f47c0b15356ed1
+  metadata.gz: 9b4040f6c70c0f480f32eb2fc9762a76d1fd23f3e7c0f44c52e250d546202d3152990fc0dd751a3a4c8d9ee7761f9ba06181c17b3cc692cea44e36ad6a5b8e76
+  data.tar.gz: 540d3353eb8955a185ceaf127ccc99d6ea3811aeaa08ad3189da813698da9577c05410bc68398e478c548ffeb7ce629ccecf3b0627ad918eb1d52bd636132a0c

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in vbuilder.gemspec
 gemspec
+
+gem "highline"

data/lib/helper.rb

@@ -0,0 +1,67 @@
+require 'helper'
+require 'highline'
+
+class Vbuilder
+    class Helper
+        module Utility
+            
+            def self.get_provider_list
+                attributes_dir = "../vbuilder/generator/attributes"
+                attributes_dir = File.expand_path(attributes_dir, __FILE__)
+
+                provider_files = Dir.entries(attributes_dir)
+                provider_files = provider_files - ["..", "."]
+
+                # return an array of all the providers
+                provider_files.map { |item| item.gsub(".yaml", "") }
+            end
+            
+            def self.get_provider_attrs(provider)
+                begin
+                    attrs_file = "../vbuilder/generator/attributes/#{provider}.yaml"
+                    attrs_file = File.expand_path(attrs_file, __FILE__)
+
+                    YAML.load(File.read(attrs_file))
+                rescue
+                    # rescue and print out cause
+                    puts "Provider '#{provider}' not valid. Vagrantfile will not be generated."
+                    puts "Valid providers:"
+                    self.get_provider_list.each { |item| puts "  - #{item}" }
+                    exit 1
+                end
+            end
+
+            def self.get_template_file
+                template_file = "../vbuilder/templates/master.erb"
+                template_file = File.expand_path(template_file, __FILE__)
+
+                File.read(template_file)
+            end
+        end
+
+        module Cli
+
+            def self.start_cli(attributes)
+                cli = HighLine.new
+                attributes.each do |key, value|
+                    if key != "dependencies" && key != "provider"
+                        case attributes[key]
+                            when Array
+                                attributes[key] = cli.ask("#{key} - (comma sep list) :", lambda { |val|val.split(/,\s*/)  })
+                            when String
+                                attributes[key] = cli.ask("#{key}: ")
+                            when Fixnum
+                                attributes[key] = cli.ask("#{key}: ", Integer)
+                            when Float
+                                attributes[key] = cli.ask("#{key}: ", Float)
+                            else
+                                puts attributes[key].class
+                        end
+                    end
+                end
+
+                attributes
+            end
+        end
+    end
+end

data/lib/vbuilder/generator.rb

@@ -1,4 +1,5 @@
 require 'vbuilder/version'
+require 'helper'
 require 'pathname'
 require 'yaml'
 require 'erb'
@@ -17,10 +18,21 @@ class Vbuilder
         end
 
         def run
-            provider_attrs = get_provider_attrs
+            # get provider attributes from correct yaml file
+            provider_attrs = Vbuilder::Helper::Utility.get_provider_attrs(@provider)
+
+            if @options[:interactive]
+                provider_attrs = Vbuilder::Helper::Cli.start_cli(provider_attrs)
+            end
+
+            # create new provider based on provider attributes
             provider = Vbuilder::Generator::Provider.new(provider_attrs)
 
-            template_file = get_template_file
+            # check provider dependencies before moving on
+            # gem execution will exit if unmet
+            provider.check_dependencies
+
+            template_file = Vbuilder::Helper::Utility.get_template_file
 
             renderer = ERB.new(template_file).result(provider.get_binding)
 
@@ -28,21 +40,5 @@ class Vbuilder
                 f.write(renderer)
             end
         end
-
-        # Helper functions
-        # TODO: Move these functions to lib/helpers.rb
-        def get_provider_attrs
-            attrs_file = "../generator/attributes/#{@provider}.yaml"
-            attrs_file = File.expand_path(attrs_file, __FILE__)
-
-            YAML.load(File.read(attrs_file))
-        end
-
-        def get_template_file
-            template_file = "../templates/master.erb"
-            template_file = File.expand_path(template_file, __FILE__)
-
-            File.read(template_file)
-        end
     end
 end

data/lib/vbuilder/generator/attributes/aws.yaml

@@ -1,13 +1,14 @@
 # YAML Containing attributes to build basic Vagrantfile with aws as provider
 
+dependencies: ["vagrant-aws"]
 provider: aws
-access_key_id:
-secret_access_key:
-session_token:
-keypair_name:
-ami:
-instance_type:
+access_key_id: ""
+secret_access_key: ""
+session_token: ""
+keypair_name: ""
+ami: ""
+instance_type: ""
 security_groups: []
-iam_instance_profile_name:
+iam_instance_profile_name: ""
 ebs_volume_size: 8
 tags: []

data/lib/vbuilder/generator/attributes/virtualbox.yaml

@@ -0,0 +1,14 @@
+# YAML Containing attributes to build basic Vagrantfile with aws as provider
+
+dependencies: ["vagrant-aws"]
+provider: aws
+access_key_id:
+secret_access_key:
+session_token:
+keypair_name:
+ami:
+instance_type:
+security_groups: []
+iam_instance_profile_name:
+ebs_volume_size: 8
+tags: []

data/lib/vbuilder/generator/options.rb

@@ -1,3 +1,6 @@
+require 'optparse'
+require 'helper'
+
 class Vbuilder
     class Generator
         class Options < Hash
@@ -8,16 +11,33 @@ class Vbuilder
 
                 @orig_args = args.clone
 
-                require 'optparse'
                 @opts = OptionParser.new do |o|
                     o.banner = "Usage: #{File.basename($0)} [options]\ne.g. #{File.basename($0)} --provider aws"
 
+                    o.on('-v', '--version', 'show ruby gem version') do |ver|
+                        puts "Version: #{Vbuilder::Version.version}"
+                        exit
+                    end
+
+                    o.on('-P', '--providers', 'see the list of valid providers') do
+                        puts "Valid providers:"
+                        Vbuilder::Helper::Utility.get_provider_list.each do |provider|
+                            puts "  - #{provider}"
+                        end
+
+                        exit
+                    end
+
                     o.on('-i', '--interactive', 'choose to interactively fill these config attributes out on the CLI') do
                         self[:interactive] = true
                     end
 
-                    o.on('--provider [PROVIDER]', 'specify the provider to use in the building of your Vagrantfile') do |provider|
-                        self[:provider] = provider
+                    o.on('-p', '--provider [PROVIDER]', 'specify the provider to use in the building of your Vagrantfile') do |provider|
+                        unless provider.nil?
+                            self[:provider] = provider
+                        else
+                            self[:invalid_argument] = "please specify a provider"
+                        end
                     end
 
                     o.separator ""

data/lib/vbuilder/generator/provider.rb

@@ -19,8 +19,20 @@ class Vbuilder
                 file = File.expand_path(template_file, __FILE__)
                 content = File.read(file)
                 t = ERB.new(content)
+
                 t.result(binding)
             end
+
+            def check_dependencies
+                installed = `vagrant plugin list`
+                @dependencies.each do |dependency|
+                    if !installed.include? dependency
+                        puts "Unmet dependency"
+                        puts "Missing plugin '#{dependency}'"
+                        exit 1
+                    end
+                end
+            end
         end
     end
 end

data/lib/vbuilder/version.rb

@@ -2,7 +2,7 @@ class Vbuilder
     module Version
         MAJOR = 0
         MINOR = 1
-        PATCH = 2
+        PATCH = 3
         BUILD = nil
 
         def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ian DesJardins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - lib/vbuilder/generator.rb
 - lib/vbuilder/generator/application.rb
 - lib/vbuilder/generator/attributes/aws.yaml
+- lib/vbuilder/generator/attributes/virtualbox.yaml
 - lib/vbuilder/generator/options.rb
 - lib/vbuilder/generator/provider.rb
 - lib/vbuilder/templates/master.erb