bib-vagrant 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321c5c79c1c30f4f74a06e99065d2d3efd47ee03
-  data.tar.gz: 5065e81e14aa4a075bdb949ddf4ae4e3164b3756
+  metadata.gz: 7133007baecfa23b1110bb1da199c3287ca47c24
+  data.tar.gz: cdd0a1c46083cf22fe43e000217a2621668ede60
 SHA512:
-  metadata.gz: 81fe49a54adf89136038fb269dd716e245b28bb35b96750da69cd53d7e7b59420fbe5266d3891cbd827c84b5d17cf3389c09c9387d4e4a855d09e650a4328401
-  data.tar.gz: 5b0d4ed21cd034e2dc9f75948f5e04f7212062064ec61ae9f241e4adb0c31bbfb2709803b6fcc7592089bab0230a2dd2bff6cbc93687b479575dc799c81ea6f2
+  metadata.gz: 152b6356535d41c0bf127a49fce4507b24d568916d59f66ffdc81948526d5af668285202eea17960030f6ab38c1cc454149050c982ea4eb617c6b613836fc323
+  data.tar.gz: 0bc5861591fc18e20184ea6ee386cd10543c65053eb773d3f9796c3436eecd877ece2c60aba8e370cc3d7b196c4d04a12f66b2328eb41d171b5d1c3f4c2e41fc

data/README.md

@@ -117,7 +117,30 @@ npm_userpass: <npm or github authentication token>
 
 NOTE: the npm_registry should be in the format of 'http[s]://host.domain.tld/' - The trailing slash is important
 
+## Developing and Testing
+
+Make sure you are using a Bundler version which is compatible with Vagrant which comes from GitHub like defined here:
+
+```
+group :development do
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+end
+```
+
+Bundler version 1.7.15 works fine and can be installed like this:
+
+```
+gem install bundler -v '~> 1.7.0'
+```
+
+Then, when you want to test Bib Vagrant use:
+
+```
+bundle _1.7.15_ exec vagrant
+```
+
+Happy developing and testing.
+
 ## Contributing
 
 See [Contributing](CONTRIBUTING.md)
-

data/lib/bib/bib_vagrant.rb

@@ -1,93 +1,175 @@
 require 'yaml'
 
+
+class String
+  def red
+    "\033[31m#{self}\033[0m"
+  end
+end
+
+
 module Bib
   module Vagrant
-    class Config
-      @@home_dir = nil
-      @@verbose = true
+    class << self
+      # Checks for plugins and takes a plugin list plus optional true/false for checking some
+      # _esoteric_ plugin constellation, see Bib::Vagrant#check_esoteric_plugin_constellation.
+      #
+      # ==== Example where given plugins are all mandatory (plugins are given as an array)
+      #
+      #   Bib::Vagrant.check_plugins(['landrush', 'vagrant-hosts'])
+      #
+      # ==== Example where a plugin may be mandatory but doesn't need to (plugins are given as a hash)
+      #
+      #   Bib::Vagrant.check_plugins(
+      #     {
+      #       'landrush' => true,
+      #       'vagrant-hosts' => false
+      #     },
+      #     true
+      #   )
+      def check_plugins(plugins, check_esoteric_plugin_constellation = true)
+        complete = true
+
+        plugins.each do |plugin, mandatory|
+          next if ::Vagrant.has_plugin?(plugin)
+          next if ENV['VAGRANT_CI']
+          puts "!!! - You are missing a plugin: #{plugin}"
+          puts '---'
+          puts "### - Please run: vagrant plugin install #{plugin}"
+          puts '---'
+          puts "!!! - Read more here: #{plugin_list[plugin]}"
+          complete = false if mandatory
+        end
 
-      def initialize(home = '~', verbose = true)
-        @@home = home
-        @@verbose = verbose
-      end
+        if check_esoteric_plugin_constellation
+          complete = self.check_esoteric_plugin_constellation ? complete : false
+        end
 
-      def get
-        vagrantconfig = get_defaults
+        complete
+      end
 
-        begin
-          localconfigfile = File.open(get_path, 'r')
-          vagrantconfig.merge!(YAML.load(localconfigfile.read))
-        rescue Errno::ENOENT
-          puts 'WARNING: No vagrant user-config found, using default cookbook path' if @@verbose
-          create(get_path, vagrantconfig)
+      # Checks for some _esoteric_ plugin constellation.
+      #
+      # Please follow the output instructions when the _esoteric_ constellation is met.
+      def check_esoteric_plugin_constellation
+        complete = true
+
+        if ::Vagrant.has_plugin?('landrush') && !Gem.loaded_specs['celluloid'].nil?
+          if Gem.loaded_specs['celluloid'].version.to_s == '0.16.1'
+            puts 'This is an esoteric issue for vagrant 1.7.4/landrush 18 and virtualbox 5.x'
+            puts 'celluloid is 0.16.1'
+            puts 'Please do the following on your HOST OS'
+            puts '    export GEM_HOME=~/.vagrant.d/gems'
+            puts '    gem uninstall celluloid -v 0.16.1'
+            puts '    gem install celluloid -v 0.16.0'
+            complete = false
+          end
         end
 
-        vagrantconfig
+        complete
       end
 
-      def has?
-        File.exist?(get_path)
+      # Returns an array which lists plugins to check where index is the name of the plugin and value
+      # is the url where the user can get more information about it.
+      def plugin_list
+        {
+          'landrush' => 'https://github.com/phinze/landrush',
+          'vagrant-hosts' => 'https://github.com/adrienthebo/vagrant-hosts',
+          'vagrant-faster' => 'https://github.com/rdsubhas/vagrant-faster#how-much-does-it-allocate',
+          'vagrant-cachier' => 'https://github.com/easybib/issues/wiki/Knowledgebase:-Global-Vagrant-setup#enable-vagrant-cachier-globally',
+          'bib-vagrant' => 'See https://github.com/easybiblabs/bib-vagrant/blob/master/README.md'
+        }
       end
 
-      def get_path
-        File.expand_path("#{@@home}/.config/easybib/vagrantdefault.yml")
+      def init_github_hostkey(machine)
+        machine.vm.provision 'shell' do |s|
+          s.inline = 'ssh -T git@github.com -o StrictHostKeyChecking=no; exit 0'
+          s.privileged = false
+        end
       end
 
-      def validate!(config)
-        current_config_keys = config.keys
-
-        get_defaults.keys.each do |required_key|
-          fail "Missing #{required_key}!" unless current_config_keys.include?(required_key)
+      def check_gatling
+        unless ::Vagrant.has_plugin?('vagrant-gatling-rsync')
+          puts "\nERROR: you're using rsync - you'll need the vagrant-gatling-rsync plugin\n"
+          puts 'do'
+          puts "\n\tvagrant plugin install vagrant-gatling-rsync\n\n"
+          puts "(also: see the README for how to increase the inotify limit)\n"
+          exit 1
         end
+        puts "\nNOTE: you're using rsync, run\n\n\tvagrant gatling-rsync-auto\n\nto auto-sync the shared folders\n\n"
+      end
 
-        errors = []
-        log_level = %w(debug info warn error fatal)
-        bool = [TrueClass, FalseClass]
-
-        cookbook_path = File.expand_path(config['cookbook_path'])
-
-        errors << 'nfs: must be a boolean' unless bool.include?(config['nfs'].class)
-        errors << 'gui: must be a boolean' unless bool.include?(config['gui'].class)
-        errors << 'cookbook_path: does not exist' unless File.directory?(cookbook_path)
-        errors << "chef_log_level: must be one of #{log_level.join}" unless log_level.include?(config['chef_log_level'])
+      def install_node_artifacts(machine, node_uri)
+        machine.vm.provision 'shell', inline: <<-SHELL
+            echo "grabbing /usr/lib/node_modules.."
+            sudo wget --continue -O /tmp/usr_node.tgz #{node_uri}
+            sudo mkdir -p /usr/lib/node_modules
+            sudo tar --overwrite -zxof /tmp/usr_node.tgz -C /usr/lib/
+            echo ".. done."
+        SHELL
+      end
 
-        unless config['additional_json'].empty?
-          errors << 'additional_json: must be empty or valid json' unless is_valid_json?(config['additional_json'])
+      def add_composertoken_to_dna(dna, vagrantconfig)
+        if vagrantconfig.key?('composer_github_token') && !vagrantconfig['composer_github_token'].empty?
+          puts "[info] Replacing OAuth2 Token for composer with user token: #{vagrantconfig['composer_github_token']}"
+          dna['composer']['oauth_key'] = vagrantconfig['composer_github_token']
+        else
+          puts "[error] You don't have a token setup in!".red
+          puts ' 1. https://github.com/settings/tokens (with repo scope only)'
+          puts ' 2. Add this line to ~/.config/easybib/vagrantdefault.yml:'
+          puts ' composer_github_token: your-token-here'
+          puts ''
+          puts "Run `vagrant #{ARGV[0]}` again!"
+          exit
         end
+        dna
+      end
 
-        return true if errors.count == 0
-
-        fail "Errors: #{errors.join(', ')}"
+      def prepare_app_settings(vagrantconfig, machine, dna, applicationlist = 'applications')
+        dna = add_composertoken_to_dna(dna, vagrantconfig)
+        dna['vagrant'][applicationlist].each do |app, app_config|
+          vagrant_share = File.expand_path(app_config['app_root_location'])
+          host_folder = "#{File.dirname(__FILE__)}/sites/#{app}"
+          if vagrantconfig['nfs']
+            machine.vm.synced_folder host_folder, vagrant_share, type: 'nfs', mount_options: ['nolock,vers=3,udp,noatime,actimeo=1']
+          elsif vagrantconfig['rsync']
+            machine.vm.synced_folder host_folder, vagrant_share, type: 'rsync'
+          else
+            machine.vm.synced_folder host_folder, vagrant_share, owner: 'vagrant'
+          end
+        end
+        dna
       end
 
-      private
+      def setup_landrush_hostnames(config, host_ip, dna, applicationlist = 'applications')
+        hosts_list = []
 
-      def create(localconfigpath, vagrantconfig)
-        FileUtils.mkdir_p(File.dirname(localconfigpath))
-        File.open(localconfigpath, 'w+') do |file|
-          file.write(vagrantconfig.to_yaml)
-          puts "INFO: Created default vagrant user-config in #{localconfigpath}" if @@verbose
-          puts 'INFO: You probably want to fix the path to the cookbooks in this file.' if @@verbose
+        dna['vagrant'][applicationlist].each do |_app, app_config|
+          # Populate Landrush and vagrant-hosts
+          host_name = "#{app_config['domain_name']}"
+          hosts_list.push(host_name)
+          config.landrush.host host_name, host_ip
         end
-      rescue
-        puts "WARNING: Unable to create default #{localconfigpath} - please do it manually." if @@verbose
-      end
 
-      def get_defaults
-        {
-          'nfs' => false,
-          'cookbook_path' => '~/Sites/easybib/cookbooks',
-          'chef_log_level' => 'debug',
-          'additional_json' => '{}',
-          'gui' => false
-        }
+        # This loop will actually populate the /etc/hsots on the guest and host OS via vagrant-hosts
+        hosts_flat = hosts_list.map { |name| name.split(' ') }.flatten.uniq
+        config.vm.provision :hosts do |provisioner|
+          # Add a single hostname
+          provisioner.add_host host_ip, hosts_flat
+        end
       end
 
-      def is_valid_json?(json)
-        JSON.parse(json)
-        return true
-      rescue JSON::ParserError
-        false
+      def default_provision(machine)
+        # remove locale passing via ssh also generate a default locale on the guest OS
+        machine.vm.provision 'shell', inline: 'sed -i "s/@AcceptEnv LANG LC_\*/# AcceptEnv LANG LC_\*/g" /etc/ssh/sshd_config'
+        machine.vm.provision 'shell', inline: 'locale-gen en_US.UTF-8'
+
+        # uncomment the next line and re-run provision if you end up with a
+        # "Failed to fetch mirror://mirrors.ubuntu.com/mirrors.txt" error:
+        # machine.vm.provision "shell", inline: "apt-spy2 fix --commit --launchpad --country=US"
+        # machine.vm.provision "shell", inline: "apt-spy2 fix --commit --launchpad --country=Germany"
+
+        machine.vm.provision 'shell', inline: 'apt-get update -y'
       end
     end
   end

data/lib/bib/bib_vagrant_config.rb

@@ -0,0 +1,94 @@
+require 'yaml'
+
+module Bib
+  module Vagrant
+    class Config
+      @@home_dir = nil
+      @@verbose = true
+
+      def initialize(home = '~', verbose = true)
+        @@home = home
+        @@verbose = verbose
+      end
+
+      def get
+        vagrantconfig = get_defaults
+
+        begin
+          localconfigfile = File.open(get_path, 'r')
+          vagrantconfig.merge!(YAML.load(localconfigfile.read))
+        rescue Errno::ENOENT
+          puts 'WARNING: No vagrant user-config found, using default cookbook path' if @@verbose
+          create(get_path, vagrantconfig)
+        end
+
+        vagrantconfig
+      end
+
+      def has?
+        File.exist?(get_path)
+      end
+
+      def get_path
+        File.expand_path("#{@@home}/.config/easybib/vagrantdefault.yml")
+      end
+
+      def validate!(config)
+        current_config_keys = config.keys
+
+        get_defaults.keys.each do |required_key|
+          fail "Missing #{required_key}!" unless current_config_keys.include?(required_key)
+        end
+
+        errors = []
+        log_level = %w(debug info warn error fatal)
+        bool = [TrueClass, FalseClass]
+
+        cookbook_path = File.expand_path(config['cookbook_path'])
+
+        errors << 'nfs: must be a boolean' unless bool.include?(config['nfs'].class)
+        errors << 'gui: must be a boolean' unless bool.include?(config['gui'].class)
+        errors << 'cookbook_path: does not exist' unless File.directory?(cookbook_path)
+        errors << "chef_log_level: must be one of #{log_level.join}" unless log_level.include?(config['chef_log_level'])
+
+        unless config['additional_json'].empty?
+          errors << 'additional_json: must be empty or valid json' unless is_valid_json?(config['additional_json'])
+        end
+
+        return true if errors.count == 0
+
+        fail "Errors: #{errors.join(', ')}"
+      end
+
+      private
+
+      def create(localconfigpath, vagrantconfig)
+        FileUtils.mkdir_p(File.dirname(localconfigpath))
+        File.open(localconfigpath, 'w+') do |file|
+          file.write(vagrantconfig.to_yaml)
+          puts "INFO: Created default vagrant user-config in #{localconfigpath}" if @@verbose
+          puts 'INFO: You probably want to fix the path to the cookbooks in this file.' if @@verbose
+        end
+      rescue
+        puts "WARNING: Unable to create default #{localconfigpath} - please do it manually." if @@verbose
+      end
+
+      def get_defaults
+        {
+          'nfs' => false,
+          'cookbook_path' => '~/Sites/easybib/cookbooks',
+          'chef_log_level' => 'debug',
+          'additional_json' => '{}',
+          'gui' => false
+        }
+      end
+
+      def is_valid_json?(json)
+        JSON.parse(json)
+        return true
+      rescue JSON::ParserError
+        false
+      end
+    end
+  end
+end

data/lib/bib/bib_vagrant_npm_provisioner.rb

@@ -18,6 +18,12 @@ end
 class BibConfigurePlugin < Vagrant.plugin('2')
   name 'NPM configuration Provisioner'
 
+  # Create a local config, unless it already exists
+  action_hook(:environment_load) do |hook|
+    config = Bib::Vagrant::Config.new
+    config.get # Creates the config file unless existing already and the gets it
+  end
+
   # This plugin provides a provisioner called unix_reboot.
   provisioner 'bib_configure_npm' do
     # Create a provisioner.

data/lib/bib/vagrant.rb

@@ -1,5 +1,6 @@
 require_relative 'version'
 require_relative 'bib_vagrant'
+require_relative 'bib_vagrant_config'
 require_relative 'bib_vagrant_npm_provisioner'
 
 require 'thor'

data/lib/bib/version.rb

@@ -1,5 +1,5 @@
 module Bib
   module Vagrant
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/test/config_test.rb

@@ -1,4 +1,5 @@
 require 'bib/bib_vagrant'
+require 'bib/bib_vagrant_config'
 
 class ConfigTest < Minitest::Test
   @@fixture_dir = nil

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: bib-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- '''tillk'','
-- '''fh'','
-- '''gilleyj'''
+- "'tillk',"
+- "'fh',"
+- "'gilleyj'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !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'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.8
 - !ruby/object:Gem::Dependency
   name: coveralls
   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: A rubygem to centralize configuration and setup in every project's Vagrantfile
@@ -132,8 +132,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -143,6 +143,7 @@ files:
 - bib-vagrant.gemspec
 - bin/bib-vagrant
 - lib/bib/bib_vagrant.rb
+- lib/bib/bib_vagrant_config.rb
 - lib/bib/bib_vagrant_npm_provisioner.rb
 - lib/bib/plugin.rb
 - lib/bib/vagrant.rb
@@ -158,20 +159,19 @@ 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.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Centralize configuration and setup
 test_files:
 - test/config_test.rb
-has_rdoc: