sumodev 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd7ccfcdd270ce3235d83ced73a93b7209848b9
-  data.tar.gz: d06e10db61e6b84da41eae9a7910020638e6a30b
+  metadata.gz: c20744ac1395f180d04f4b07a8b13406858a93ab
+  data.tar.gz: 1c55c3b01c438bb45b67abe872ed932e58a8e75e
 SHA512:
-  metadata.gz: f68c419039e200ea161d437ee86908e70a7f26f40efd675487f7eaa8adc2e3ba4446b07781f7b0bcbef67f41d443c193d8c1ff794e1d3e37328e240e22082a3e
-  data.tar.gz: 9aa8d81d76fe829a284271bfe2e0132f605ab9ba4460e0de08280ce8ec5350ba6e7828d5ffe1784cbaff5e8d6c6b45ebb277f0e5e6d363b219c095327e49ed22
+  metadata.gz: 0f89cfbb8b39610708613f4b1c228e161bd1072d4f6659fe6b23ca11d2d8e95ffd1aa4c98f75cd23ad7ba26f26aa1f31b654c244897e7e85afa10ba3b0e21f6d
+  data.tar.gz: d0afac6d94889ab2ebe2f7becb51852baec0e54e2f37031effd62addcec5bd0d6a3f3fce2a65d8eb5ae4623451d6f0a91d49e0f5fffe11f07f9740bbf8ba521f

data/lib/sumodev/commands/box.rb

@@ -1,95 +1,87 @@
-require 'sumodev/command'
-require 'sumodev/config'
-require 'sumodev/sumofile'
-
-class Sumodev::Commands::Box < Sumodev::Command
-  namespace :box
-
-  no_commands do
-    def box_path
-      possible_paths = [
-        Dir.pwd,
-        Sumodev::Config.get('SUMO_VAGRANT_PATH')
-      ]
-
-      vagrantfile = possible_paths.detect do |path|
-        File.file?(File.join(File.expand_path(path), "Vagrantfile"))
-      end || raise("No Vagrant file found in #{possible_paths.join(', ')}")
-
-      File.expand_path(vagrantfile)
-    end
-
-    def run_vagrant_command(command, *arguments)
-      # See https://github.com/mitchellh/vagrant/issues/5199#issuecomment-73278236
-      if ["reload", "halt"].include?(command.split(" ")[0])
-        system "rm -rf #{box_path}/.vagrant/machines/*/virtualbox/synced_folders"
-      end
-      system "cd #{box_path}; vagrant #{command} #{arguments.join(' ')}"
-    end
-
-    def box_running?
-      output = `cd #{box_path}; vagrant status`
-      output =~ /The VM is running/
-    end
-
-    def configure_port_mapping
-      return unless Sumodev::Config.true?('SUMO_FORWARD_PORTS')
-      system "sudo pfctl -f /etc/pf.conf"
-    end
-
-    def convert_sumofile_into_env_variables
-      sumofile_path = Dir.pwd + "/Sumofile"
-
-      file = Sumodev::Sumofile.from_file sumofile_path
-      file.convert_into_json_file
-    end
-  end
-
-  desc 'up', "Starts the Vagrant-box"
-  def up
-    say("There is already a box running, you should manually start the box. Or halt the running instance", :red) && exit(1) if box_running?
-
-    convert_sumofile_into_env_variables
-    configure_port_mapping
-    run_vagrant_command("up", "--provision")
-  rescue Sumodev::Sumofile::NoSuchFileError
-    say("No Sumofile found! Please define one so the correct versions will be used!", :red) && exit(1)
-  end
-
-  desc 'install', "Installs everything required to use the box command"
-  def install
-    # install vagrant plugins
-    %x(vagrant plugin install vagrant-omnibus)
-    %x(vagrant plugin install vagrant-vbguest)
-    %x(vagrant plugin install vagrant-berkshelf)
-    %x(berks vendor berks-cookbooks)
-
-    # install .sumorc file
-    File.open(File.expand_path("~/.sumorc"), 'w') do |f|
-      f.write <<-SUMORC
-        export SUMO_VAGRANT_PATH=""
-SUMORC
-    end unless File.exists?(File.expand_path("~/.sumorc"))
-
-    # setup resolver
-    File.open("/tmp/vagrant-resolver", 'w') do |f|
-      f.write <<-RESOLVER
-# Created by sumo command
-nameserver 10.11.12.13
-port 53
-      RESOLVER
-    end
-
-    %x(sudo mv /tmp/vagrant-resolver /etc/resolver/vagrant)
-  end
-
-  # Vagrant commands
-  %w(halt provision resume reload ssh status suspend).each do |method|
-    class_eval <<-VAGRANT_METHOD
-      desc '#{method}', 'Runs the #{method} vagrant command'
-      def #{method}(*args)
-        run_vagrant_command("#{method} \#{args.join(' ')}")
-      end
-    VAGRANT_METHOD
-  end
-end
+require 'sumodev/command'
+require 'sumodev/config'
+require 'sumodev/sumofile'
+
+class Sumodev::Commands::Box < Sumodev::Command
+  namespace :box
+
+  no_commands do
+    def box_path
+      possible_paths = [
+        Dir.pwd,
+        Sumodev::Config.get('SUMO_VAGRANT_PATH')
+      ]
+
+      vagrantfile = possible_paths.detect do |path|
+        File.file?(File.join(File.expand_path(path), "Vagrantfile"))
+      end || raise("No Vagrant file found in #{possible_paths.join(', ')}")
+
+      File.expand_path(vagrantfile)
+    end
+
+    def run_vagrant_command(command, *arguments)
+      # See https://github.com/mitchellh/vagrant/issues/5199#issuecomment-73278236
+      if ["reload", "halt"].include?(command.split(" ")[0])
+        system "rm -rf #{box_path}/.vagrant/machines/*/virtualbox/synced_folders"
+      end
+      system "cd #{box_path}; vagrant #{command} #{arguments.join(' ')}"
+    end
+
+    def box_running?
+      output = `cd #{box_path}; vagrant status`
+      output =~ /The VM is running/
+    end
+
+    def convert_sumofile_into_env_variables
+      sumofile_path = Dir.pwd + "/Sumofile"
+
+      file = Sumodev::Sumofile.from_file sumofile_path
+      file.convert_into_json_file
+    end
+  end
+
+  desc 'up', "Starts the Vagrant-box"
+  def up
+    say("There is already a box running, you should manually start the box. Or halt the running instance", :red) && exit(1) if box_running?
+
+    convert_sumofile_into_env_variables
+    run_vagrant_command("up", "--provision")
+  rescue Sumodev::Sumofile::NoSuchFileError
+    say("No Sumofile found! Please define one so the correct versions will be used!", :red) && exit(1)
+  end
+
+  desc 'install', "Installs everything required to use the box command"
+  def install
+    # install vagrant plugins
+    %x(vagrant plugin install vagrant-share)
+    %x(vagrant plugin install vagrant-berkshelf)
+
+    # install .sumorc file
+    File.open(File.expand_path("~/.sumorc"), 'w') do |f|
+      f.write <<-SUMORC
+        export SUMO_VAGRANT_PATH=""
+SUMORC
+    end unless File.exists?(File.expand_path("~/.sumorc"))
+
+    # setup resolver
+    File.open("/tmp/vagrant-resolver", 'w') do |f|
+      f.write <<-RESOLVER
+# Created by sumo command
+nameserver 10.11.12.13
+port 53
+      RESOLVER
+    end
+
+    %x(sudo mv /tmp/vagrant-resolver /etc/resolver/vagrant)
+  end
+
+  # Vagrant commands
+  %w(halt provision resume reload ssh status suspend).each do |method|
+    class_eval <<-VAGRANT_METHOD
+      desc '#{method}', 'Runs the #{method} vagrant command'
+      def #{method}(*args)
+        run_vagrant_command("#{method} \#{args.join(' ')}")
+      end
+    VAGRANT_METHOD
+  end
+end

data/lib/sumodev/commands/push.rb

@@ -12,12 +12,13 @@ class Sumodev::Commands::Push < Thor::Group
   Tijs = {:groups => ['admin', 'developer', 'root'], :identity => 'tijs@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAABIwAAAQEAueoZUITVE/YVZVZVi4cngE7FPK5+a3mt0mTtELdFM4JmXg7UmrQ1On2IwIdHw5Cq+VnrutRgWvQkfp+WaC2tzOrlzccpMeMv5lTRH7bRp6qR4FivJ/Aq7YeUrNJpzncUVTwyeHrveuhfCxEQoOIM2gN0Y54NGDTOp01D7GHApsYkObsw/3N7jgQVoL6xKPwRTMI52tFzUlkv+df78vx87X7bYK05dO4Ol8U0yFyKlV17+BEM4UuI/aTXhkNsBVNCqiksaqQwEGDK8IqyrNFYhbRwYDunTXc8zdd6imYfEJUSNdjOzTXUNUc15ssTMBsGpfvF/2bhYRlHuRWZP9BUqw==', :protocol => 'rsa'}
   Jens = {:groups => ['admin', 'root'], :identity => 'jens@dehaese.eu', :key => 'AAAAB3NzaC1yc2EAAAABIwAAAIEAojZQXjhcy3fpHNEBqlj2C3EV+G+vOTSBvcn+U3Sq7eml+NrQqGoasAvC+c6bajJTRB0ZujynsUAWghDM43zY1SIbZl6PC0jdZg7qGjzlpOFdG96b84agiE6Dnz8Mjnb6846tJdslRV2Yyc9Y8iSgW3s3mszmW2hqHpZ4EqbVuPc=', :protocol => 'rsa'}
   Mathias = {:groups => ['developer'], :identity => 'mathias@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDLBHWXILbcsYfoDYCgJq4B3Q9ElcZq0hRWo8otXWsOP1pYU8Kq2thWbIB+RkuZr8Y7DMI2XtGXSquWJdx0Beddxt+yVoE/eReorVuB74bnEVXYtcZ8+mNHU6paC1T4XHMWjEXSgaEaSPdxnQxPPzQ+YDuJkYWaCrLxDyWe4sqio0R5SA5CasTkei5dHIfIzj8a16JvTj/FlbNrGHzdSwWY04QoSRdN3rpWJ4krzlHz5NIJmBhUxW15d9NgmKPGJYHmUyY1nfXdb82/zUS1vt6A/46hMJzRXhQuxzNVNBFN2q8d/bXhsNW6AZ467auWO3NLBUOfGHMX+Ga6FQiyCdhd', :protocol => 'rsa'}
-  Jonas = {:groups => ['developer'], :identity => 'jonas@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDM4PlwtAMTRW78OsIdmeHhWKxeJ6GvYN/06OJsRpdvqcviDkghgHlB5hDz9ceMb96WUuIJQi/UFM6DcED4md4GVKoql8NmV3upaI6J+K6LPVIBfBG5C9S/NCXAInQozBisvfqNU5rRsh06HCsEnAMIOkgyqX/ZSgwat0XqfL/7w7NLT2QC1Zp08HbTJauFMljzGz6RErWlfy3XYTpMJA6Cnj9S2qn2/7wuGavLJrIo5swKqabO2SFV0MERgmTmPjDHYJoCffZjF2r8fG2NjZWVlPNuqesWP0wNlKvkFVRU3XYB7hsNjolCNzxAw3SjaqyuHo3RDvgks6gs2GSh8iev', :protocol => 'rsa'}
+  Jonas = {:groups => ['developer'], :identity => 'jonas@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCtGlJ6rNof3BcHTh7mPELGfVOThfP9LnRZOXHYnzahok1XjWxhQlafdJYblFyhnC0qpo0IqHO6dqNzYXq3JAXDRT2b3Cuq7M1v9f91Fk3EVtP53k+Q8FdFSgjdGZj/JhrP3Y7yctXKXaUCpqBBTaVd+Wy2KEIPHBAmspCAKHcbrBmOUzuWhREI5+ZU3SQ85c8fkTFifln2Tlrc15StfgwQ/epAMZYuYzWZLwfamBLqQCGTIfUNMF4JdFiuQuDLr5enH3d5gM8GjQr/Z17K8MLZhNmKhqrlTOJfX8egD82TL/SYNpkHgnmyYfj4MF85zu5JuaR2Ab18gAYVyoCJfAzR', :protocol => 'rsa'}
   Jelmer = {:groups => ['developer'], :identity => 'jelmer@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDEPm7EZctIAbdiTYIL/Oelaqiu39JjrSqxD0N80m66w/KLdvQiAEPWRinBKPCzBsmcMKuA0MMoDzykTLgNsVoAnR5hzAOJeL96803vN3FC/LeJw09Mcrh1WXoY6T5KLZFcPuaxwwx4IASWgbTEHetmJVtMey423phs1X1feT6QQaHeh3ryAe3qaMs1Z7ksOEsyifUOC67Aa/G0IbP3QJlYOk1wtLvQ+4+uIoyG3BJ9RM17gMrHMTBH2eUc/Tk4kYv/3LPlajwXb1U0fNNqgrWaOcsDoqsHShh+f0dPj83X1KTBp8FspTcm9ww7KaAjgvWwH6B3XIbsSAwgsQHNaWQj', :protocol => 'rsa'}
   Daan = {:groups => ['developer'], :identity => 'daan@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCfWibmP8Dc1GlR0x/PsmriYBcBg4GPjwpnuxrZ5G8vnFeYjXM5myZ2hFdRvzog/xO/wr+y42n4VQp5wjEw1QX8TvnmUJtEcczR930U5QSMXqiDJWRjFVXducJXfrERu2BonZUhMTaAxYnguSLkRmqBLeUIooDwKIPIaVVlkbW11H6Lk711/eZm+fdLXF732lzM5XA7pRZVpU1+PykMgQ8oJmJGCQmKIZQUh+qKDEjv9akiZt5jUu6jJkXb3lqtRMbgej5XacuXzebU2nW1OQZp3Qz4iBBA7pOfejgJWt1KN25dzfOA0vRZsfCxQav8sOP8ow4Mt1teJpDFgUH96n8x', :protocol => 'rsa'}
   Wouter = {:groups => ['developer'], :identity => 'wouter@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDPMmfnXWFuuT9h/CRY+S4apJLbBfMpM6wZ1dcqtIk4O5P0rSmnXIZZpZP9XGxU5dP2+y6KGj+Egr4YZClKTHTgTcVEukW3n73c2ObCg5bCW+wJxvk3ns6G046rWACLIkX+Ben3YhBa09mXnPk0CRtzHUIrnMsExaxnaU/cJ7miF9gJq5pm8gwH0f0Ek7hWHtGVralEJX97wwey4rB/0js7YQqKjYtwtUncnVjRntyrLkIZ/gXnY9FZEqH+GGXho6yhqAT2+VkWdax+cyIZxvimfNcA7mCTStv/1pMSrrygMnONZ6TLDdJm+2THh9tRZ3UoWGQUlWJ1QnV5Ox2cVWvj', :protocol => 'rsa'}
   Stijn = {:groups => ['developer'], :identity => 'stijn@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQD6OcLSJGrR8PQ4hCnPVrnyXbhiCQSeB2l8JitV1NcrbwxwZ15wh4xDNKhhUlIlxGnXWLLadOePEhJ2ESUjEm2x5FJ1p06Bj6rsEDGvKBtUjUq5PXFvKY8qoyc6jV1vjz6FXuZBHk7k9X5JIZhORAs1LcwCpOEQwsfjnJ1KGBanvcFbAIpRej4qlzAKcfDtykC8XTODlSgj6GSqLz65LY+SrdTDe2XZ4qHyntVXbnLjX9fRaVWInU8fkoKUkLogUTRXszAKUfqrJBI7em3FQqOu40gRrdzevS4vTbeNu+fe9rodVmlBKEFdbKELhppke7a/kN04vcATazXJOKoGh/v/', :protocol => 'rsa'}
   Katrien = {:groups => ['developer'], :identity => 'katrien@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCnIup0Q/3Ja/YQWrpg20yhWARfS3kdL2obssWvwlVOZv08vsxiH4S5KrYLQW5Fn5ethBsuKDb0yuZzFfsVkbv1uXMYRRqmEW+HnlF+tchsRqpVqUKNTWigtw3zeuDHDsk3GJzQHCpUI8ha/1CBZRre0oxYJCHYH8wslji33ZAn3HxbUH9Y+E3XnWjfrgK05oY5SVgbQ6bf0Fn1UZ3uai7+xh1kNPsUM3Rx91vdhhhQi4SesFwaslYB4gnG010fgp0Hn9DTV7P6Vk7AFVWRw12Zvmhi97BC9IglKP9qHYVf60gObbuuoXK5zBlIrRnbytm7ZXt/kVNT5OL+P5H9OLkt', :protocol => 'rsa'}
+  Dylan = {:groups => ['developer'], :identity => 'dylan@sumocoders.be', :key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDAYDY7+cZ1bJyD4VEhDru64KuuPzURoWeJblTI1bt/EESQPdIHKKqbMrxrL8l9C8ft++Dni70nKJy7foXHAirEO0SB/SXdcDKvr91mCmWRXCtZm54JptYU1sKP2Lpe1W2gdc5OazCzGhCI7mJoi/BuvcVOaK1EEB9dKR6cUm01tJ+CVonYSChiTors50MCFEyike5uq6TjDcVviHufmcxOTRJTd/0I5zCImGjhEXOydXU2DknxEbtPIlD94JLcMiOnmycOf4bPOOe4DF1XHgx5C4g+TKbmn5FjLIEyMZ3skGBSNh7HWBlAsUB4qilVkHfiq5ZP2JKEwGWmSw6XPMQ9', :protocol => 'rsa'}
 
   def replace_keys
     connect do |ssh|
@@ -59,7 +60,7 @@ class Sumodev::Commands::Push < Thor::Group
   end
 
   def users
-    [Jan, Tijs, Jens, Mathias, Jonas, Jelmer, Daan, Wouter, Stijn, Katrien]
+    [Jan, Tijs, Jens, Mathias, Jonas, Jelmer, Daan, Wouter, Stijn, Katrien, Dylan]
   end
 
   def authorized_users

data/lib/sumodev/version.rb

@@ -1,3 +1,3 @@
 module Sumodev
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumodev
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jan De Poorter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SumoCoders Developers gem