vagrant-impressbox 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7058d0e553b2b94d55a1a23dc84bef2256d969f4
-  data.tar.gz: 7ad515e10500a70ede69ce1dc2796cd6e29cffd0
+  metadata.gz: eb87ddda30acb51620df45fb0b6af4651bcc38c4
+  data.tar.gz: aca4ba8308f4ecff748e252790798bf86ea2b875
 SHA512:
-  metadata.gz: 68778fb8535b5b7826cea599470263320c4deba03513435883dda6a37d507a8b819420c379871ea3580eb7a1dab86907f650bdd7176dcefbd9cb7b06a98640ba
-  data.tar.gz: 11bdfab2e693518a67a35409b610d88d3ac5c71d660acb7b4c11fd4da4780667353e3893dad11b2f47de98238dea16e81a1d94dd0ce612d42832a5e24c4d1f0f
+  metadata.gz: 665f819e3746fd938188f2259a04f54196ba23bbc43b0dd68efa8c1c98ae1be1486b92d597e56df3c92119607a3117da166061dc84468ec441ba07ef934a5f77
+  data.tar.gz: 84ea5a35a4cc74e587ee4c7e5219f3388615bf225ec5768956664643afe21353618690ec2be81d3e489f0d516f4182c3cb13e00b607a3f94145fbcd9cead7d4a

data/.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{sh,markdown}]
+indent_size = 4
+
+[**.rb]
+indent_style = space
+indent_size = 2

data/README.md

@@ -1,6 +1,4 @@
-# **!!! DOESN'T WORK YET. Please wait !!!**
-
-------
+[![Gem](https://img.shields.io/gem/dtv/vagrant-impressbox.svg)](https://rubygems.org/gems/vagrant-impressbox) [![Gem](https://img.shields.io/gem/v/vagrant-impressbox.svg)](https://rubygems.org/gems/vagrant-impressbox) [![license](https://img.shields.io/github/license/ImpressCMS/vagrant-impressbox.svg?maxAge=2592000)](License.txt) 
 
 # ImpressBox
 
@@ -8,24 +6,34 @@ ImpressBox is plugin to make easier to configure virtual enviroment for Vagrant.
 
 ## Installation
 
-`vagrant plugin install impressbox`
+Run below command from your command line:
+`vagrant plugin install vagrant-impressbox`
 
 ## Usage
 
-`vagrant impressbox`
+To use Impressbox plugin, you can run `vagrant impressbox` command from command line. It will create required configuration files. Also it's possible to use some options to modify default configuration files creation behavior:
 
-## Development
+    vagrant impressbox [options]
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+      -b, --box=BOX_NAME               Box name for new box (default: ImpressCMS/DevBox-Ubuntu)
+          --ip=IP                      Defines IP (default: )
+          --url=HOSTNAME               Hostname associated with this box (default: impresscms.dev)
+          --memory=RAM                 How much RAM (in megabytes)? (default: 512)
+          --cpus=CPU_NUMBER            How much CPU? (default: 1)
+      -r, --recreate                   Recreates config instead of updating (so you don't need to delete first)
+      -f, --for=NAME                   This argument says that predefined config will be used when creating box. Possible names: impresscms
+      
+      -h, --help                       Print this help
+
+## Development
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+If you want to try add something to this plugin, you need before starting do these things:
+ * Clone this repository
+ * Open command line in cloned directory
+ * Run `bundle install`
+ 
+If you want to your changes, you can run `bundle exec vagrant impressbox` command (also here is possible to use some commands options).
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ImpressCMS/impressbox.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/vagrant-impressbox/actions/insert_key.rb

@@ -1,56 +1,64 @@
-module Impressbox
-  module Actions
-    # This is action to insert keys to remote machine when booting
-    class InsertKey
-      def initialize(app, env)
-        @app = app
-        @ui = env[:ui]
-      end
-
-      def call(env)
-        @app.call env
-        @machine = env[:machine]
-        insert_ssh_key_if_needed(
-          Impressbox::Plugin.get_item(:public_key),
-          Impressbox::Plugin.get_item(:private_key)
-        )
-      end
-
-      private
-
-      def insert_ssh_key_if_needed(public_key, private_key)
-        @machine.communicate.wait_for_ready 300
-
-        machine_private_key @machine.communicate, private_key
-        machine_public_key @machine.communicate, public_key
-      end
-
-      def machine_public_key(communicator, public_key)
-        @ui.info I18n.t('ssh_key.updating.public')
-        machine_upload_file communicator, public_key, '~/.ssh/id_rsa.pub'
-        communicator.execute 'touch ~/.ssh/authorized_keys'
-        communicator.execute 'cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys'
-        communicator.execute "echo `awk '!a[$0]++' ~/.ssh/authorized_keys` > ~/.ssh/authorized_keys"
-
-        communicator.execute 'chmod 600 ~/.ssh/id_rsa.pub'
-      end
-
-      def machine_private_key(communicator, private_key)
-        @ui.info I18n.t('ssh_key.updating.private')
-        machine_upload_file communicator, private_key, '~/.ssh/id_rsa'
-        communicator.execute 'chmod 400 ~/.ssh/id_rsa'
-      end
-
-      def machine_upload_file(communicator, src_file, dst_file)
-        communicator.execute 'chmod 777 ' + dst_file + ' || :'
-        communicator.execute 'touch ' + dst_file
-        communicator.execute 'truncate -s 0 ' + dst_file
-        text = File.open(src_file).read
-        text.gsub!(/\r\n?/, "\n")
-        text.each_line do |line|
-          communicator.execute "echo \"#{line.rstrip}\" >> #{dst_file}"
-        end
-      end
-    end
-  end
-end
+module Impressbox
+  module Actions
+    # This is action to insert keys to remote machine when booting
+    class InsertKey
+      def initialize(app, env)
+        @app = app
+        @ui = env[:ui]
+        puts app.inspect
+      end
+
+      def call(env)
+        @app.call env
+        @machine = env[:machine]
+        insert_ssh_key_if_needed(
+          Impressbox::Plugin.get_item(:public_key),
+          Impressbox::Plugin.get_item(:private_key)
+        )
+      end
+
+      private
+
+      def insert_ssh_key_if_needed(public_key, private_key)
+        @machine.communicate.wait_for_ready 300
+
+        machine_private_key @machine.communicate, private_key
+        machine_public_key @machine.communicate, public_key
+      end
+
+      def machine_public_key(communicator, public_key)
+        @ui.info I18n.t('ssh_key.updating.public')
+        if machine_upload_file communicator, public_key, '~/.ssh/id_rsa.pub'
+          communicator.execute 'touch ~/.ssh/authorized_keys'
+          communicator.execute 'cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys'
+          communicator.execute "echo `awk '!a[$0]++' ~/.ssh/authorized_keys` > ~/.ssh/authorized_keys"
+
+          communicator.execute 'chmod 600 ~/.ssh/id_rsa.pub'
+        end        
+      end
+
+      def machine_private_key(communicator, private_key)
+        @ui.info I18n.t('ssh_key.updating.private')
+        if machine_upload_file communicator, private_key, '~/.ssh/id_rsa'
+          communicator.execute 'chmod 400 ~/.ssh/id_rsa'
+        end
+      end
+
+      def machine_upload_file(communicator, src_file, dst_file)
+        if src_file.nil?
+          @ui.info I18n.t('ssh_key.not_found')
+          return false
+        end        
+        communicator.execute 'chmod 777 ' + dst_file + ' || :'
+        communicator.execute 'touch ' + dst_file
+        communicator.execute 'truncate -s 0 ' + dst_file
+        text = File.open(src_file).read
+        text.gsub!(/\r\n?/, "\n")
+        text.each_line do |line|
+          communicator.execute "echo \"#{line.rstrip}\" >> #{dst_file}"
+        end
+        true
+      end
+    end
+  end
+end

data/lib/vagrant-impressbox/provisioner.rb

@@ -1,103 +1,107 @@
-# Loads all requirements
-require 'vagrant'
-require_relative File.join('objects', 'ssh_key_detect.rb')
-
-# Impressbox namepsace
-module Impressbox
-  # Provisioner namepsace
-  class Provisioner < Vagrant.plugin('2', :provisioner)
-    # @!attribute [rw] provision_actions
-    attr_accessor :provision_actions
-
-    def provision
-      if !@provision_actions.nil? && @provision_actions.to_s.length > 0
-        @machine.communicate.wait_for_ready 300
-
-        @machine.communicate.execute(@provision_actions.to_s) do |type, line|
-          write_line type, line
-        end
-      end
-    end
-
-    def cleanup
-    end
-
-    def configure(root_config)
-      configurator = create_configurator(root_config)
-      cfg = xaml_config
-
-      do_primary_configuration configurator, cfg
-      do_ssh_configuration configurator, cfg
-      do_provider_configuration configurator, cfg
-      do_network_configuration configurator, cfg
-      do_provision_configure configurator, cfg
-    end
-
-    private
-
-    def write_line(type, contents)
-      case type
-      when :stdout
-        @machine.ui.info contents
-      when :stderr
-        @machine.ui.error contents
-      else
-        @machine.ui.info 'W: ' + type
-        @machine.ui.info contents
-      end
-    end
-
-    def do_provision_configure(_configurator, cfg)
-      @provision_actions = cfg.provision if !cfg.provision.nil? && cfg.provision
-    end
-
-    def do_primary_configuration(configurator, cfg)
-      configurator.name cfg.name
-      configurator.check_for_update cfg.check_update
-      configurator.forward_ports cfg.ports
-    end
-
-    def do_network_configuration(configurator, cfg)
-      configurator.configure_network cfg.ip unless cfg.ip.nil?
-      aliases = cfg.hostname
-      if aliases.is_a?(Array)
-        hostname = aliases.shift
-      else
-        hostname = aliases.dup
-        aliases = []
-      end
-      configurator.configure_hostnames(hostname, aliases)
-    end
-
-    def do_ssh_configuration(configurator, cfg)
-      keys = Impressbox::Objects::SshKeyDetect.new(cfg)
-      configurator.configure_ssh keys.public_key, keys.private_key
-    end
-
-    def do_provider_configuration(configurator, cfg)
-      configurator.basic_configure cfg.name, cfg.cpus, cfg.memory, cfg.gui
-      configurator.specific_configure cfg
-    end
-
-    def detect_provider
-      if ARGV[1] && (ARGV[1].split('=')[0] == '--provider' || ARGV[2])
-        return (ARGV[1].split('=')[1] || ARGV[2])
-      end
-      (ENV['VAGRANT_DEFAULT_PROVIDER'] || :virtualbox).to_sym
-    end
-
-    def create_configurator(root_config)
-      require_relative File.join('objects', 'configurator')
-      Impressbox::Objects::Configurator.new(
-        root_config,
-        @machine,
-        detect_provider
-      )
-    end
-
-    def xaml_config
-      require_relative File.join('objects', 'config_file')
-      Impressbox::Objects::ConfigFile.new @config.file
-    end
-  end
-end
+# Loads all requirements
+require 'vagrant'
+require_relative File.join('objects', 'ssh_key_detect.rb')
+
+# Impressbox namepsace
+module Impressbox
+  # Provisioner namepsace
+  class Provisioner < Vagrant.plugin('2', :provisioner)
+
+    # @!attribute [rw] provision_actions
+    attr_accessor :provision_actions
+
+    # Do provision
+    def provision
+      if !@provision_actions.nil? && @provision_actions.to_s.length > 0
+        @machine.communicate.wait_for_ready 300
+
+        @machine.communicate.execute(@provision_actions.to_s) do |type, line|
+          write_line type, line
+        end
+      end
+    end
+
+    # Cleanup script
+    def cleanup
+    end
+
+    # Configure
+    def configure(root_config)
+      configurator = create_configurator(root_config)
+      cfg = xaml_config
+
+      do_primary_configuration configurator, cfg
+      do_ssh_configuration configurator, cfg
+      do_provider_configuration configurator, cfg
+      do_network_configuration configurator, cfg
+      do_provision_configure configurator, cfg
+    end
+
+    private
+
+    def write_line(type, contents)
+      case type
+      when :stdout
+        @machine.ui.info contents
+      when :stderr
+        @machine.ui.error contents
+      else
+        @machine.ui.info 'W: ' + type
+        @machine.ui.info contents
+      end
+    end
+
+    def do_provision_configure(_configurator, cfg)
+      @provision_actions = cfg.provision if !cfg.provision.nil? && cfg.provision
+    end
+
+    def do_primary_configuration(configurator, cfg)
+      configurator.name cfg.name
+      configurator.check_for_update cfg.check_update
+      configurator.forward_ports cfg.ports
+    end
+
+    def do_network_configuration(configurator, cfg)
+      configurator.configure_network cfg.ip unless cfg.ip.nil?
+      aliases = cfg.hostname
+      if aliases.is_a?(Array)
+        hostname = aliases.shift
+      else
+        hostname = aliases.dup
+        aliases = []
+      end
+      configurator.configure_hostnames(hostname, aliases)
+    end
+
+    def do_ssh_configuration(configurator, cfg)
+      keys = Impressbox::Objects::SshKeyDetect.new(cfg)
+      configurator.configure_ssh keys.public_key, keys.private_key
+    end
+
+    def do_provider_configuration(configurator, cfg)
+      configurator.basic_configure cfg.name, cfg.cpus, cfg.memory, cfg.gui
+      configurator.specific_configure cfg
+    end
+
+    def detect_provider
+      if ARGV[1] && (ARGV[1].split('=')[0] == '--provider' || ARGV[2])
+        return (ARGV[1].split('=')[1] || ARGV[2])
+      end
+      (ENV['VAGRANT_DEFAULT_PROVIDER'] || :virtualbox).to_sym
+    end
+
+    def create_configurator(root_config)
+      require_relative File.join('objects', 'configurator')
+      Impressbox::Objects::Configurator.new(
+        root_config,
+        @machine,
+        detect_provider
+      )
+    end
+
+    def xaml_config
+      require_relative File.join('objects', 'config_file')
+      Impressbox::Objects::ConfigFile.new @config.file
+    end
+  end
+end

data/lib/vagrant-impressbox/templates/config.yaml

@@ -63,11 +63,6 @@ memory: {{memory}}
 # ---------------------------------------------------------------------------------------
 check_update: {{#check_update}}true{{/check_update}}{{^check_update}}false{{/check_update}}
 
-# ---------------------------------------------------------------------------------------
-# What command should execute vagrant exec command on host?
-# ---------------------------------------------------------------------------------------
-cmd: {{cmd}}
-
 # ---------------------------------------------------------------------------------------
 # What shell commands will be executed on provision?
 # ---------------------------------------------------------------------------------------

data/lib/vagrant-impressbox/version.rb

@@ -1,4 +1,4 @@
-# Plugin version information
-module Impressbox
-  VERSION = '0.1.0'.freeze
-end
+# Plugin version information
+module Impressbox
+  VERSION = '0.1.1'.freeze
+end

data/locales/en.yml

@@ -1,28 +1,30 @@
-en:
-    description: |
-        This plugin adds possibility to create and manage box with configuration defined in YAML file.
-        This plugin is created for developing something with ImpressCMS but it's possible to use also with other CMS'es and framework.
-    ssh_key:
-        updating:
-            public: Updating public key...
-            private: Updating private key...
-    copying:
-        git_settings: Copying locale GIT settings to remote machine...
-    config:
-        recreated: Vagrant enviroment configuration (re)created
-        updated: Vagrant enviroment configuration updated
-        not_exist: "Config file %{file} not exist"
-    command:
-        impressbox:
-            synopsis: Creates a Vagrantfile and config.yaml ready for use with ImpressBox
-            usage: "Usage: %{cmd} [options]"
-            arguments: 
-                box: "Box name for new box (default: %{box})"
-                ip: "Defines IP (default: %{ip})"
-                hostname: "Hostname associated with this box (default: %{hostname})"
-                memory:  "How much RAM (in megabytes)? (default: %{memory})"
-                cpus: "How much CPU? (default: %{cpus})"
-                cmd: "What command would be executed when use vagrant exec on host? (default: %{cmd})"   
-                special:
-                    recreate: "Recreates config instead of updating (so you don't need to delete first)"    
+en:
+    description: |
+        This plugin adds possibility to create and manage box with configuration defined in YAML file.
+        This plugin is created for developing something with ImpressCMS but it's possible to use also with other CMS'es and framework.
+    ssh_key:
+        updating:
+            public: Updating public key...
+            private: Updating private key...
+        not_found:
+            No SSH Key possible to load.
+    copying:
+        git_settings: Copying locale GIT settings to remote machine...
+    config:
+        recreated: Vagrant enviroment configuration (re)created
+        updated: Vagrant enviroment configuration updated
+        not_exist: "Config file %{file} not exist"
+    command:
+        impressbox:
+            synopsis: Creates a Vagrantfile and config.yaml ready for use with ImpressBox
+            usage: "Usage: %{cmd} [options]"
+            arguments: 
+                box: "Box name for new box (default: %{box})"
+                ip: "Defines IP (default: %{ip})"
+                hostname: "Hostname associated with this box (default: %{hostname})"
+                memory:  "How much RAM (in megabytes)? (default: %{memory})"
+                cpus: "How much CPU? (default: %{cpus})"
+                cmd: "What command would be executed when use vagrant exec on host? (default: %{cmd})"   
+                special:
+                    recreate: "Recreates config instead of updating (so you don't need to delete first)"    
                     use_template: "This argument says that predefined config will be used when creating box. Possible names: %{templates}"

data/vagrant-impressbox.gemspec

@@ -1,31 +1,31 @@
-# coding: utf-8
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
-require 'vagrant-impressbox/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'vagrant-impressbox'
-  spec.version       = Impressbox::VERSION
-  spec.authors       = ["Raimondas Rimkevi\xC4\x8Dius"]
-  spec.email         = ['mekdrop@impresscms.org']
-
-  spec.summary       = <<-EOD
-    This plugin can do provision and create configurations for simple boxes for development
-  EOD
-  spec.description = <<-EOD
-    This plugin can do provision and create configurations for simple boxes for development
-  EOD
-  spec.homepage      = 'http://impresscms.org'
-  spec.license       = 'MIT'
-
-  spec.files = `git ls-files -z`.split("\0")
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_path = 'lib'
-
-  spec.add_development_dependency 'bundler', '<= 1.11.2'
-  spec.add_development_dependency 'rake', '~> 1.10.6'
-  spec.add_development_dependency 'rspec', '~> 2.14.0'
-
-  spec.add_dependency 'mustache', '~> 1.0'
-  spec.add_dependency 'vagrant-hostmanager', '~> 1.8', '>= 1.8.1'
-end
+# coding: utf-8
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+require 'vagrant-impressbox/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'vagrant-impressbox'
+  spec.version       = Impressbox::VERSION
+  spec.authors       = ["Raimondas Rimkevi\xC4\x8Dius (aka MekDrop) <mekdrop@impresscms.org>"]
+  spec.email         = ['mekdrop@impresscms.org']
+
+  spec.summary       = <<-EOD
+    This plugin can do provision and create configurations for simple boxes for development
+  EOD
+  spec.description = <<-EOD
+    This plugin can do provision and create configurations for simple boxes for development
+  EOD
+  spec.homepage      = 'http://impresscms.org'
+  spec.license       = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\0")
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_path = 'lib'
+
+  spec.add_development_dependency 'bundler', '<= 1.10.6'
+  spec.add_development_dependency 'rake', '~> 1.10.6'
+  spec.add_development_dependency 'rspec', '~> 2.14.0'
+
+  spec.add_dependency 'mustache', '~> 1.0'
+  spec.add_dependency 'vagrant-hostmanager', '~> 1.8', '>= 1.8.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-impressbox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- Raimondas Rimkevičius
+- Raimondas Rimkevičius (aka MekDrop) <mekdrop@impresscms.org>
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"