rouster 0.68 → 0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2922e8289682a6859c9e8425df652eb5af74b93
-  data.tar.gz: 2862b48d598fd179b986458f214232f65ca483cf
+  metadata.gz: 7b0d2cb460b4d6fad86880726845308f77c14cf8
+  data.tar.gz: 66319f2e227a7bbb4d51458ca3f6628ef281ddf0
 SHA512:
-  metadata.gz: 34ce58498c46e4eccc008177db64cefdfc5e1f4ae66df0e7a34cd1abbac60b2bd12929f6b60e31b418153deb7c9a946c6c955f0d210c6fc3d9851a9dbc319485
-  data.tar.gz: 40599a85f744aea565ce406870890b8ad92620cc7aba21f02e4eb721aa3368d80208c176790e003a650e4e00f7afdb268cf0b167fa22732900bed1ba8e10b85c
+  metadata.gz: c6854485af207e64f012b3d45a79e9f90844cf403b0dfbfa41915b6832e9678004e0b6d5b98fd6bdd6dd73da802de36490e7d06715a704d8a34c701b8428f1d2
+  data.tar.gz: 93b7c1a6577ced94ed8cc9bd31341ee90af333aa4a8759c73a5b418ef1281b548326640d1f1cb81ab47c4c777719d670cdb03314fad38d33fedf0bf5be9476b5

data/.reek

@@ -0,0 +1,63 @@
+---
+
+Attribute:
+  enabled: false
+
+# so judgy.. and without context
+BooleanParameter:
+  enabled: false
+
+ControlParameter:
+  enabled: false
+
+DataClump:
+  min_clump_size: 4
+
+DuplicateMethodCall:
+  enabled: false
+
+# this is not a real thing
+FeatureEnvy:
+  enabled: false
+
+# this should have understanding of non-required parameters
+LongParameterList:
+  max_params: 5
+
+NestedIterators:
+  max_allowed_nesting: 3
+
+# you don't know my life
+NilCheck:
+  enabled: false
+
+# more lacking context judgement - when _would_ you be ok with '!' ?
+PrimaDonnaMethod:
+  enabled: false
+
+# this feels a bit arbitrary.. maybe would make more sense if was an average
+TooManyStatements:
+  max_statements: 30
+
+# see above
+TooManyInstanceVariables:
+  max_instance_variables: 20
+
+# see above
+TooManyMethods:
+  max_methods: 20
+
+# i don't name my exceptions specifically. that doesn't make me a bad person.
+UncommunicativeVariableName:
+  accept: /^[a|b|e|f|g|h|i|j|k|l|m|p|r|s|u|v]$/
+
+# or my comparators in ~sort() functions
+## https://github.com/troessner/reek/issues/886
+UncommunicativeParameterName:
+  accept:
+    - a
+    - b
+
+# got dinged for using class variables.. how else would you use self.startup?
+exclude_paths:
+  - test/

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+
+notifications:
+  email: false
+
+bundler_args: --without test --jobs 3 --retry 3
+script: bundle exec rake test:unit build
+

data/Gemfile

@@ -6,9 +6,11 @@ gem 'json'
 gem 'log4r', '~> 1.1.9'
 gem 'net-scp'
 gem 'net-ssh'
+gem 'rake', '= 10.4.2'
 
 group :development do
   gem 'test-unit', '~> 3.0.0'
+  gem 'reek', '= 3.10.2'
 end
 
 gem 'fog', '= 1.24.0', :groups => [:aws, :openstack]

data/Gemfile.lock

@@ -1,7 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.3.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.2)
+    codeclimate-engine-rb (0.3.1)
+      virtus (~> 1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.11)
     excon (0.40.0)
     fog (1.24.0)
       fog-brightbox
@@ -39,6 +51,7 @@ GEM
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
+    ice_nine (0.11.2)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.1)
@@ -51,17 +64,39 @@ GEM
     net-ssh (2.9.1)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
+    parser (2.3.3.0)
+      ast (~> 2.2)
     power_assert (0.1.4)
+    rainbow (2.1.0)
+    rake (10.4.2)
+    reek (3.10.2)
+      codeclimate-engine-rb (~> 0.3.1)
+      parser (~> 2.3, >= 2.3.0.6)
+      rainbow (~> 2.0)
     test-unit (3.0.2)
       power_assert
+    thread_safe (0.3.5)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fog
+  fog (= 1.24.0)
   json
   log4r (~> 1.1.9)
   net-scp
   net-ssh
+  rake (= 10.4.2)
+  reek (= 3.10.2)
   test-unit (~> 3.0.0)
+
+RUBY VERSION
+   ruby 2.0.0p648
+
+BUNDLED WITH
+   1.13.6

data/README.md

@@ -1,6 +1,8 @@
 Rouster
 ======
 
+[![build status](https://travis-ci.org/chorankates/rouster.svg)](https://travis-ci.org/chorankates/rouster) [![Gem Version](https://badge.fury.io/rb/rouster.svg)](https://rubygems.org/gems/rouster)
+
 ```rb
 Rouster.is_a?('abstraction layer for controlling Vagrant virtual machines')
 => true
@@ -61,9 +63,6 @@ irb(main):001:0> require 'rouster'
 
 ### pre-built gem installation (stable)
 
-[RubyGems](http://rubygems.org/gems/rouster)
-[![Gem Version](https://badge.fury.io/rb/rouster.png)](http://badge.fury.io/rb/rouster)
-
 ```sh
 gem install rouster
 ```

data/Rakefile

@@ -1,11 +1,14 @@
 require sprintf('%s/%s', File.dirname(File.expand_path(__FILE__)), 'path_helper')
 require 'rubygems'
 require 'rake/testtask'
+require 'reek/rake/task'
 
-task :buildgem do
+desc 'build the gem'
+task :build do
   sh 'gem build rouster.gemspec'
 end
 
+desc 'cleanup environment'
 task :clean do
   sh 'rm /tmp/rouster-*'
 end
@@ -14,56 +17,67 @@ task :default do
   sh 'ruby test/basic.rb'
 end
 
+desc 'run the example demo'
 task :demo do
   sh 'ruby examples/demo.rb'
 end
 
+desc 'rdoc generation'
 task :doc do
   sh 'rdoc --line-numbers lib/*'
 end
 
 task :examples do
   Dir['examples/**/*.rb'].each do |example|
-	  sh "ruby #{example}"
-	end
+    sh "ruby #{example}"
+  end
 end
 
+desc 'shortcut to vagrant destroy -f'
 task :vdestroy do
   sh 'vagrant destroy -f'
 end
 
-task :reek do
-  sh 'reek lib/**/*.rb'
+Reek::Rake::Task.new do |t|
+  t.config_file   = sprintf('%s/.reek', File.dirname(__FILE__))
+  #t.source_files  = FileList.new('lib/**/*.rb', 'plugins/**/*.rb')
+  t.source_files  = FileList.new('lib/**/*.rb')
+  t.reek_opts     = '--no-wiki-links'
+  t.fail_on_error = false
+  t.verbose       = true
 end
 
-Rake::TestTask.new(:test => :vdestroy) do |t|
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/test_*.rb']
-  t.verbose = true
-end
+namespace :test do
+  Rake::TestTask.new(:all => :vdestroy) do |t|
+    t.description = 'run all tests'
+    t.libs << 'lib'
+    t.test_files = FileList['test/**/test_*.rb']
+  end
 
-Rake::TestTask.new do |t|
-  t.name = 'unit'
-  t.libs << 'lib'
-  t.test_files = FileList['test/unit/**/test_*.rb']
-  t.verbose = true
-end
+  Rake::TestTask.new do |t|
+    t.name = 'unit'
+    t.description = 'run unit tests'
+    t.libs << 'lib'
+    t.test_files = FileList['test/unit/**/test_*.rb']
+  end
 
-Rake::TestTask.new(:functional => :vdestroy) do |t|
-  t.libs << 'lib'
-  t.test_files = FileList['test/functional/**/test_*.rb']
-  t.verbose = true
-end
+  Rake::TestTask.new(:functional => :vdestroy) do |t|
+    t.description = 'run functional tests'
+    t.libs << 'lib'
+    t.test_files = FileList['test/functional/**/test_*.rb']
+  end
 
-Rake::TestTask.new(:deltas => :vdestroy) do |t|
-  t.libs << 'lib'
-  t.test_files = FileList['test/functional/deltas/test_*.rb']
-  t.verbose = true
-end
+  Rake::TestTask.new(:deltas => :vdestroy) do |t|
+    t.description = 'run delta tests'
+    t.libs << 'lib'
+    t.test_files = FileList['test/functional/deltas/test_*.rb']
+  end
 
-Rake::TestTask.new do |t|
-  t.name = 'puppet'
-  t.libs << 'lib'
-  t.test_files = FileList['test/puppet/test*.rb']
-  t.verbose = true
+  Rake::TestTask.new do |t|
+    t.name        = 'puppet'
+    t.description = 'run puppet tests'
+    t.libs << 'lib'
+    t.test_files  = FileList['test/puppet/test*.rb']
+    t.verbose = true
+  end
 end

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.68
+  VERSION = 0.69
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users

data/lib/rouster/deltas.rb

@@ -144,22 +144,33 @@ class Rouster
 
     res = Hash.new()
 
-    raw = self.run('cat /etc/group')
+    {
+      :file    => self.run('cat /etc/group'),
+      :dynamic => self.run('getent group', [0,127]),
+    }.each_pair do |source, raw|
 
-    raw.split("\n").each do |line|
-      next unless line.match(/\w+:\w+:\w+/)
+      raw.split("\n").each do |line|
+        next unless line.match(/\w+:\w+:\w+/)
+
+        data = line.split(':')
 
-      data = line.split(':')
+        group = data[0]
+        gid   = data[2]
 
-      group = data[0]
-      gid   = data[2]
+        # this works in some cases, deep functionality picks up the others
+        users = data[3].nil? ? ['NONE'] : data[3].split(',')
 
-      # this works in some cases, deep functionality picks up the others
-      users = data[3].nil? ? ['NONE'] : data[3].split(',')
+        if res.has_key?(group)
+          @logger.debug(sprintf('for[%s] old GID[%s] new GID[%s]', group, gid, res[group][:users])) unless gid.eql?(res[group][:gid])
+          @logger.debug(sprintf('for[%s] old users[%s] new users[%s]', group, users)) unless users.eql?(res[group][:users])
+        end
+
+        res[group] = Hash.new() # i miss autovivification
+        res[group][:gid]    = gid
+        res[group][:users]  = users
+        res[group][:source] = source
+      end
 
-      res[group] = Hash.new() # i miss autovivification
-      res[group][:gid]   = gid
-      res[group][:users] = users
     end
 
     groups = res
@@ -755,20 +766,39 @@ class Rouster
 
     res = Hash.new()
 
-    raw = self.run('cat /etc/passwd')
+    {
+      :file    => self.run('cat /etc/passwd'),
+      :dynamic => self.run('getent passwd', [0,127]),
+    }.each do |source, raw|
 
-    raw.split("\n").each do |line|
-      next if line.match(/(\w+)(?::\w+){3,}/).nil?
-
-      user = $1
-      data = line.split(':')
+      raw.split("\n").each do |line|
+        next if line.match(/(\w+)(?::\w+){3,}/).nil?
+
+        user = $1
+        data = line.split(':')
+
+        shell       = data[-1]
+        home        = data[-2]
+        home_exists = self.is_dir?(data[-2])
+        uid         = data[2]
+        gid         = data[3]
+
+        if res.has_key?(user)
+          @logger.info(sprintf('for[%s] old shell[%s], new shell[%s]', res[user][:shell], shell)) unless shell.eql?(res[user][:shell])
+          @logger.info(sprintf('for[%s] old home[%s], new home[%s]', res[user][:home], home)) unless home.eql?(res[user][:home])
+          @logger.info(sprintf('for[%s] old home_exists[%s], new home_exists[%s]', res[user][:home_exists], home_exists)) unless home_exists.eql?(res[user][:home_exists])
+          @logger.info(sprintf('for[%s] old UID[%s], new UID[%s]', res[user][:uid], uid)) unless uid.eql?(res[user][:uid])
+          @logger.info(sprintf('for[%s] old GID[%s], new GID[%s]', res[user][:gid], gid)) unless gid.eql?(res[user][:gid])
+        end
 
-      res[user] = Hash.new()
-      res[user][:shell] = data[-1]
-      res[user][:home]  = data[-2]
-      res[user][:home_exists] = self.is_dir?(data[-2])
-      res[user][:uid]   = data[2]
-      res[user][:gid]   = data[3]
+        res[user] = Hash.new()
+        res[user][:shell]       = shell
+        res[user][:home]        = home
+        res[user][:home_exists] = home_exists
+        res[user][:uid]         = uid
+        res[user][:gid]         = gid
+        res[user][:source]      = source
+      end
     end
 
     if cache

data/lib/rouster/vagrant.rb

@@ -48,7 +48,7 @@ class Rouster
     @logger.info('up()')
 
     # don't like putting this here, may be refactored
-    if self.is_passthrough? 
+    if self.is_passthrough?
       if (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
          self.aws_up()
       elsif (self.passthrough[:type].equal?(:openstack))
@@ -87,7 +87,7 @@ class Rouster
     @logger.info('destroy()')
 
     # don't like putting this here, may be refactored
-    if self.is_passthrough? 
+    if self.is_passthrough?
       if (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
         self.aws_destroy()
       elsif self.is_passthrough? and self.passthrough[:type].equal?(:openstack)
@@ -121,7 +121,7 @@ class Rouster
 
     # don't like putting this here, may be refactored
     @logger.info('status()')
-    if self.is_passthrough? 
+    if self.is_passthrough?
       if (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
         status = self.aws_status()
       elsif self.passthrough[:type].equal?(:openstack)
@@ -167,7 +167,7 @@ class Rouster
   def reload(no_provision = true)
 
     if self.is_passthrough?
-      @logger.warn(sprintf('calling [vagrant reload] on a passthrough host is a noop', face))
+      @logger.warn('calling [vagrant reload] on a passthrough host is a noop')
       return nil
     end
 

data/test/unit/test_parse_ls_string.rb

@@ -326,6 +326,25 @@ class TestParseLsString < Test::Unit::TestCase
     assert_equal(expectation, res)
   end
 
+  def test_uid_forced
+    uid = 501
+    str = "-rw-r--r--  1 #{uid}  root  0 Jun 13 09:35 foo\n"
+
+    res = @app.exposed_parse_ls_string(str)
+
+    assert_equal('501', res[:owner])
+
+  end
+
+  def test_gid_forced
+    gid = 10
+    str = "-rw-r--r--  1 vagrant  #{gid}  0 Jun 13 09:35 foo\n"
+
+    res = @app.exposed_parse_ls_string(str)
+
+    assert_equal('10', res[:group])
+  end
+
   def test_dir_detection
     dir_str = "drwxrwxrwt 5 root root 4096 May 28 00:26 /tmp/\n"
     file_str  = "-rw-r--r-- 1 root    root      906 Oct  2  2012 grub.conf\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.68'
+  version: '0.69'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,6 +116,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .reek
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE