vagrant-tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223938120159ab83c8dcbd85f7b159cf985cd966
-  data.tar.gz: 116911824dbf2fe3b9b9290da10f9e73ff8b02d4
+  metadata.gz: b5ed01a07ce8a97adc20e1e6fb20e30d8f1334cc
+  data.tar.gz: f57c0f59cb1f0307610a21c6d2807144118fe792
 SHA512:
-  metadata.gz: f12b48fad246a5c6bfe7ddefb1d989ecaa49d4a228f0b6bfe44f8af2745d49f8e9723fb9eab143eb09acc5f2d735b01046a035fbf4ae1c70636e86e327e47f70
-  data.tar.gz: 4efa91af35cb46613d1e4aad748b47f44728b73983f89a0c1895c992d0db6d117ef3aa04af481aef14196f181bf56e5cdd65eca7d73effec5aa8907b80b9f75c
+  metadata.gz: a107c36cc992c367db116b2a6f560419453a8cb3dc13e449a0866cf317107399b82e048d903ca982d5f42ee60cab2eca3b3eddf4d497ad30dd15ec898d3badc7
+  data.tar.gz: aed44e14e4f3d9a64cb028ac3fbfaeaf8a6c77f2ee699bbaf964d07f0dbd6bebd3d4a83c2518e3b5288087cbff5be63873d702ecc63796e7dc4fc3cdb87a5818

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.0
+  - ruby-head
+before_install:
+  - gem update --system
+  - gem --version

data/README.md

@@ -2,6 +2,8 @@
 
 Vagrant cli configuration management tool. The missing tool for vagrant that allows you to control all your vagrant instances. Use cli command: `vgls` to list all vagrant configs (all Vagrantfiles), and `vgctl [target] [vgcmd]` to control configurations from outside the Vagrantfile dir.
 
+[![Build Status](https://travis-ci.org/dblommesteijn/vagrant-tools.svg?branch=master)](https://travis-ci.org/dblommesteijn/vagrant-tools)  [![Code Climate](https://codeclimate.com/github/dblommesteijn/vagrant-tools.png)](https://codeclimate.com/github/dblommesteijn/vagrant-tools) [![Dependency Status](https://gemnasium.com/dblommesteijn/vagrant-tools.svg)](https://gemnasium.com/dblommesteijn/vagrant-tools)
+
 **Example**
 
 ```bash
@@ -47,7 +49,9 @@ $ vgctl some-project destroy testing
 
 * Current/ Master
 
-  * stub
+  * Fix indexing new Vagrantfile configuration [#1](https://github.com/dblommesteijn/vagrant-tools/issues/1)
+  * Fix VERSION variable warning
+  * Fix skip empty process cmdline
 
 
 ## Installation
@@ -93,8 +97,8 @@ vgctl
 Verbose, this will output operations to STDOUT
 
 ```bash
-vgls -v
-vgctl -v
+vgls -V
+vgctl -V
 ```
 
 Change target configuration (find operation), base from where .vagrant configs are discovered:

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/unit/*.rb']
+  t.verbose = true
+end
+
+task default: [:build, :install]

data/bin/vgctl

@@ -18,10 +18,11 @@ def main()
     begin
       opts = GetoptLong.new(
         ['--prefix', '-p', GetoptLong::REQUIRED_ARGUMENT],
-        ['--verbose', '-v', GetoptLong::NO_ARGUMENT],
+        ['--verbose', '-V', GetoptLong::NO_ARGUMENT],
         ['--refresh-cache', '-x', GetoptLong::NO_ARGUMENT],
         ['--only-active', '-a', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
+        ['--version', '-v', GetoptLong::NO_ARGUMENT],
       )
       opts.each do |opt, arg|
         case opt
@@ -48,6 +49,9 @@ usage: vgctl [-pvxhc] [TARGET [COMMAND | shell]]
   h : show this help message
             EOF
           exit
+        when '--version'
+          print "vagrant-tools: %s\r\n" % Vagrant::Tools::VERSION
+          exit
         else
           puts "extra: " + opt + "|" + arg
         end

data/bin/vgls

@@ -19,12 +19,13 @@ def main()
     begin
       opts = GetoptLong.new(
         ['--prefix', '-p', GetoptLong::REQUIRED_ARGUMENT],
-        ['--verbose', '-v', GetoptLong::NO_ARGUMENT],
+        ['--verbose', '-V', GetoptLong::NO_ARGUMENT],
         ['--refresh-cache', '-x', GetoptLong::NO_ARGUMENT],
         ['--only-active', '-a', GetoptLong::NO_ARGUMENT],
         ['--zombies', '-z', GetoptLong::NO_ARGUMENT],
-        ['--vagrantfile', '-V', GetoptLong::NO_ARGUMENT],
+        ['--vagrantfile', '-F', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
+        ['--version', '-v', GetoptLong::NO_ARGUMENT],
       )
       opts.each do |opt, arg|
         case opt
@@ -46,7 +47,7 @@ def main()
 vgls, version: #{Vagrant::Tools::VERSION}
 
 usage: vgls [-pvxh] [TARGET]
-  
+
   p : set lookup prefix (default $HOME)
   v : verbose output
   x : refresh cached results (.vagrant lookup)
@@ -58,6 +59,9 @@ usage: vgls [-pvxh] [TARGET]
   h : show this help message
             EOF
           exit
+        when '--version'
+          print "vagrant-tools: %s\r\n" % Vagrant::Tools::VERSION
+          exit
         end
       end
     rescue GetoptLong::InvalidOption => e
@@ -165,10 +169,10 @@ usage: vgls [-pvxh] [TARGET]
         output.append("-- Vagrantfile (#{node.vagrantfile}): ---------------------")
         output.append(node.vagrantfile_contents)
       end
-    else 
+    else
       # print all nodes
       if node.is_a?(Vagrant::Tools::Orm::Config)
-        output.append(node)
+        output.append(node) if !node.hidden
       elsif node.is_a?(Vagrant::Tools::Orm::Machine)
         output.append("- #{node.name} ", :nonewline)
       elsif node.is_a?(Vagrant::Tools::Orm::Provider)
@@ -178,7 +182,7 @@ usage: vgls [-pvxh] [TARGET]
   end
 
   # append cache status
-  if root.cache.cache_old?
+  if root.cache.cache_old? && !cfg.refresh_cache
     a = root.cache.cache_time_a
     output.append("cache is %dd, %dh, %dm, and %ds old (consider refreshing -x)" % a)
   elsif cfg.verbose

data/lib/vagrant/tools.rb

@@ -1,7 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + "/tools/version")
 require File.expand_path(File.dirname(__FILE__) + "/tools/config")
 require File.expand_path(File.dirname(__FILE__) + "/tools/cache")
 require File.expand_path(File.dirname(__FILE__) + "/tools/root")
-require File.expand_path(File.dirname(__FILE__) + "/tools/version")
 require File.expand_path(File.dirname(__FILE__) + "/tools/output")
 require File.expand_path(File.dirname(__FILE__) + "/tools/helper")
 require File.expand_path(File.dirname(__FILE__) + "/tools/orm/config")

data/lib/vagrant/tools/cache.rb

@@ -3,14 +3,17 @@ module Vagrant
 
     class Cache
 
+      CACHE_VERSION = "#{Vagrant::Tools::VERSION}a"
+
       # attr_accessor :prefix, :verbose, :output, :options, :target, :cmd
       PATH = "#{ENV["HOME"]}/.vagrant-tools"
 
-      def initialize(path = PATH)
+      def initialize(output, path = PATH)
+        @output = output
         @path = path
         @cfg = Vagrant::Tools.get_config
         unless File.exists?(@path)
-          puts "creating `#{path}`" if @cfg.verbose
+          @output.append("creating `#{path}`", :verbose)
           FileUtils.mkpath(@path)
         end
         @filename = "#{@path}/settings.json"
@@ -20,24 +23,33 @@ module Vagrant
       def get_config
         return {} unless File.exists?(@filename)
         begin
-          puts "reading cache file: `#{@filename}`" if @cfg.verbose
+          @output.append("reading cache file: `#{@filename}`", :verbose)
           json = JSON.parse(File.read(@filename), {symbolize_names: true})
+          if json.include?(:version)
+            raise "old config version" if json[:version] != CACHE_VERSION
+          else
+            raise "old config version"
+          end
           c_time = Time.at(json[:configs_date])
-          puts "cache time: `#{c_time}`" if @cfg.verbose
+          @output.append("cache time: `#{c_time}`", :verbose)
           @delta = Cache.time_delta(c_time) #if json.include?(:configs_date)
           return json[:configs]
         rescue Exception => e
-          puts e.message
-          puts e
+          @output.append(e.message)
+          @output.append(e)
+          @output.flush()
           return {}
         end
       end
 
       def set_config(dirs)
-        puts "writing to `#{@filename}`" if @cfg.verbose
-        config_paths = { configs_date: Time.now.to_i, configs: dirs.flat_map{|k,v| v.map(&:config_path)} }
+        @output.append("writing to `#{@filename}`", :verbose)
+        config_paths = {}
+        config_paths[:version] = CACHE_VERSION
+        config_paths[:configs_date] = Time.now.to_i
+        config_paths[:configs] = dirs.flat_map{|k,v| v.map(&:config_path)}
         flat_json = JSON.pretty_generate(config_paths)
-        puts flat_json if @cfg.verbose
+        @output.append(flat_json, :verbose)
         File.open(@filename,"w") do |f|
           f.write(flat_json)
         end
@@ -48,8 +60,8 @@ module Vagrant
       end
 
       def cache_time_a
-        mm, ss = @delta.divmod(60) 
-        hh, mm = mm.divmod(60) 
+        mm, ss = @delta.divmod(60)
+        hh, mm = mm.divmod(60)
         dd, hh = hh.divmod(24)
         [dd, hh, mm, ss]
       end

data/lib/vagrant/tools/orm/config.rb

@@ -8,19 +8,17 @@ module Vagrant
 
         ENV_SHELL = ENV["SHELL"]
 
-        attr_accessor :name, :project_root, :offset, :config_path, :vagrantfile, :parent
+        attr_accessor :name, :project_root, :offset, :config_path, :vagrantfile, :parent, :hidden
 
         def initialize(cfg, output, parent, config_path)
           @cfg = cfg
           @output = output
           self.parent = parent
           self.config_path = config_path
+          self.hidden = self.hidden_path?(config_path)
           self.project_root = File.absolute_path("#{config_path}/../")
           self.vagrantfile = File.absolute_path("#{self.project_root}/Vagrantfile")
-          @machines = Dir["#{self.config_path}/machines/*"].flat_map{|t| Machine.new(@cfg, @output, self, t)}
-          self.name = File.basename(File.absolute_path("#{config_path}/../"))
-          self.offset = 0
-          @output.append("found config: `#{self.config_path}`", :verbose)
+          self.populate_machine_list
         end
 
         def project_root_name
@@ -32,7 +30,9 @@ module Vagrant
           "#{self.project_root_name}#{o}"
         end
 
-        def exec_vagrant_command(command)
+        def exec_vagrant_command(command, options=[])
+          options = [options] unless options.is_a?(Array)
+          silent = options.include?(:silent) ? " > /dev/null" : ""
           # TODO: add some cmd check?
           cmd = ""
           case command
@@ -40,7 +40,7 @@ module Vagrant
             raise "no shell found (in $SHELL)" if ENV_SHELL.nil? || ENV_SHELL == ""
             cmd = "(cd #{self.project_root} && #{ENV_SHELL})"
           else
-            cmd = "(cd #{self.project_root} && vagrant #{command})"
+            cmd = "(cd #{self.project_root} && vagrant #{command}#{silent})"
           end
           @output.append(cmd, :verbose)
           # system call to command
@@ -68,6 +68,12 @@ module Vagrant
           "#{self.project_root_name_with_offset} (#{@project_root})"
         end
 
+        def hidden_path?(config_path)
+          @output.append("check hidden path? `#{config_path}`", :verbose)
+          @output.flush()
+          !config_path.match(/\/\.[\w]+/).nil?
+        end
+
         def to_outputs
           machines = @machines.map(&:to_outputs).join("")
           if !@cfg.output[:only_active]
@@ -88,6 +94,28 @@ module Vagrant
 
         protected
 
+        def get_machine_paths()
+          target = "#{self.project_root}/.vagrant/machines"
+          return [] if !File.exists?(target)
+          Dir["#{target}/*"]
+        end
+
+        def populate_machine_list
+          machine_paths = self.get_machine_paths()
+          @output.append("machine dirs found: #{machine_paths.size}", :verbose)
+          # lookup if machines path is created (else run vagrant status)
+          if !self.hidden && @cfg.refresh_cache
+            @output.append("reloading machine paths `vagrant status`", :verbose)
+            # create machines path
+            self.exec_vagrant_command("status", :silent)
+            machine_paths = self.get_machine_paths()
+          end
+          @machines = machine_paths.flat_map{|t| Machine.new(@cfg, @output, self, t)}
+          self.name = File.basename(File.absolute_path("#{config_path}/../"))
+          self.offset = 0
+          @output.append("found config: `#{self.config_path}`", :verbose)
+        end
+
       end
 
     end

data/lib/vagrant/tools/orm/provider.rb

@@ -31,6 +31,7 @@ module Vagrant
         def process
           return @process if !@process.nil? || self.id.nil?
           Helper.iterate_processes do |p|
+            next if p.cmdline.nil?
             @process = p if p.cmdline.include?(self.id)
           end
           @process

data/lib/vagrant/tools/output.rb

@@ -31,6 +31,11 @@ module Vagrant
         end
       end
 
+      def flush()
+        self.render()
+        @buffer = []
+      end
+
     end
   end
 end

data/lib/vagrant/tools/root.rb

@@ -8,20 +8,16 @@ module Vagrant
 
       attr_accessor :cache
 
-      LOOKUP_DIR = ".vagrant"
+      LOOKUP_DIR = "Vagrantfile"
 
       def initialize(cfg, output)
         @cfg = cfg
         @output = output
         @dirs = {}
-        self.cache = Cache.new
+        self.cache = Cache.new(@output)
         self.find_vagrant_configs
       end
 
-      # def find_by_project_root(project_root_name)
-      #   self.get_config_without_offset(project_root_name)
-      # end
-
       def find_vagrant_configs
         unless @dirs.empty?
           @output.append("config already loaded (use -x to force reload)", :verbose)
@@ -36,46 +32,12 @@ module Vagrant
             # create new config instance
             self.add_config_dirs(config)
           end
-          return self 
+          return self
         end
-        # findin configs via find
-        cmd = "find \"#{prefix}\" -type d -name \"#{LOOKUP_DIR}\""
-        @output.append("finding vagrant configs: `#{cmd}`...", :verbose)
-        Open3.popen3(cmd) do |stdin, stdout, stderr|
-          stdin.close_write
-          stdout.read.split("\n").each do |config_file|
-            # create new config instance
-            self.add_config_dirs(config_file)
-          end
-          stderr.close_read
-        end
-        self.cache.set_config(@dirs)
+        self.find_configs(prefix)
         self
       end
 
-      # def to_outputs
-      #   ret = []
-      #   if @cfg.target.nil?
-      #     # print all
-      #     ret << @dirs.flat_map{|k,t| t.map(&:to_outputs)}
-      #   else
-      #     ret << self.get_config_without_offset(@cfg.target).to_outputs      
-      #   end
-      #   ret.join
-      # end
-
-    #     if @cfg.target.nil?
-    #       configs = @dirs.flat_map{|k,t| t}
-    #     else
-    #       configs = [self.get_config_without_offset(@cfg.target)]
-    #     end
-
-    #         # filter `target`
-    # elsif !cfg.target.nil?
-    #   if node.is_a?(Vagrant::Tools::Orm::Root)
-    #     nodes << node
-    #   end
-
       def visit(&block)
         configs = @dirs.flat_map{|k,t| t}
         block.call(self)
@@ -96,8 +58,6 @@ module Vagrant
         false
       end
 
-
-
       protected
 
       def add_config_dirs(config)
@@ -109,6 +69,22 @@ module Vagrant
         nil
       end
 
+      def find_configs(prefix)
+        # findin configs via find
+        cmd = "find \"#{prefix}\" -type f -name \"#{LOOKUP_DIR}\""
+        @output.append("finding vagrant configs: `#{cmd}`...", :verbose)
+        @output.flush()
+        Open3.popen3(cmd) do |stdin, stdout, stderr|
+          stdin.close_write
+          stdout.read.split("\n").each do |config_file|
+            # create new config instance
+            self.add_config_dirs(config_file)
+          end
+          stderr.close_read
+        end
+        self.cache.set_config(@dirs)
+      end
+
     end
   end
 end

data/lib/vagrant/tools/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Tools
-    VERSION = "0.1.1"
+    VERSION ||= "0.1.2"
   end
 end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'test/unit'
+require 'coveralls'
+Coveralls.wear!

data/test/unit/defaults.rb

@@ -0,0 +1,11 @@
+
+require 'test_helper'
+
+class Defaults < Test::Unit::TestCase
+
+  def test_me
+    assert true, "always true!"
+  end
+
+end
+

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dennis Blommesteijn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant CLI configuration management tool for Unix
@@ -61,7 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,6 +79,8 @@ files:
 - lib/vagrant/tools/output.rb
 - lib/vagrant/tools/root.rb
 - lib/vagrant/tools/version.rb
+- test/test_helper.rb
+- test/unit/defaults.rb
 - vagrant-tools.gemspec
 homepage: https://github.com/dblommesteijn/vagrant-tools
 licenses:
@@ -89,18 +92,20 @@ 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.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant CLI configuration management tool for Unix
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/unit/defaults.rb