wocker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b6e3df2fabd741a403a07361c83895c354a6c4b0ddcd2d8ebd5f80648dfe76
-  data.tar.gz: 976484279f1e8c2991f7ba9d582fd237af6d76e46cc6dd6989c2198a60226bbd
+  metadata.gz: 38dcece4d9f2ed8dd4e5af61d2b53d4a3f7e51fe9ee5f81cc387d18f2c1cfc8f
+  data.tar.gz: e8a352a9dc447a79d84d44037ecae40097be8ca3c67b6a050b89f09320c93612
 SHA512:
-  metadata.gz: 2a32898e6e82410df01e3964dfb73cd537cdf89f216606fb765cc660494074a957bb8180b348e3a0b9098a22d4bf796da48ef727beb4a09ec14ebfa4b18826e6
-  data.tar.gz: dac571860cfa31c102f073be8d3202f2299d6f5dea7a56ecf14768e3683a316c30df6eb1bb1d12875c1c6ce8452b53a4fd081fa2816b7de903a3f488171e3010
+  metadata.gz: 1bfe5f0b3eb772eebeddb8d0e29b6baf257554985b5e13ecc7627748f5ec9de137874b7c07bd8c6cb9aa453c22d5b45c378908270b8a75a2a504aba4e72bfb4e
+  data.tar.gz: 36797d42577056e749c41d06a911fe24480949c2b83bc1f4135bc0db155022965b76f5af913e80ce480b7cfdd4a43895c6f5fc3f8ba4c764d10e309061b0b159

data/.gitignore

@@ -9,3 +9,7 @@
 
 # rspec failure tracking
 .rspec_status
+
+.vagrant
+Wockerfile
+Vagrantfile

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wocker (0.1.0)
+    wocker (0.2.0)
       clamp
 
 GEM

data/lib/wocker/cli/build_command.rb

@@ -4,10 +4,14 @@ module Wocker
   module Cli
     class BuildCommand < Clamp::Command
       option "--interface", "INTERFACE", "network interface"
+      option "--choco", :flag, "install chocolatey"
 
       def execute
-        Wocker::Vagrantfile.run "destroy", "-f"
-        Wocker::Vagrantfile.run "up", interface: interface
+        v = Wocker::Vagrantfile.new interface: interface, choco: choco?
+        v.create_from_wockerfile!
+
+        Wocker::Vagrant.run "destroy", "-f"
+        Wocker::Vagrant.run "up"
       end
     end
   end

data/lib/wocker/cli/exec_command.rb

@@ -6,8 +6,16 @@ module Wocker
       parameter "COMMAND ...", "command"
 
       def execute
+        command_list.insert 0, "cd"
+        workdir = if Wockerfile.workdir
+          Wockerfile.workdir
+        else
+          "/vagrant"
+        end
+        command_list.insert 1, "#{workdir};"
+
         cmd = command_list.join " "
-        Wocker::Vagrantfile.run "winrm", "-c", cmd
+        Wocker::Vagrant.run "winrm", "-c", cmd
       end
     end
   end

data/lib/wocker/cli/init_command.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Wocker
+  module Cli
+    class InitCommand < Clamp::Command
+      def execute
+        FileUtils.cp File.join(Wocker.gem_root_path, "templates", "Wockerfile"), "Wockerfile"
+      end
+    end
+  end
+end

data/lib/wocker/cli/port_command.rb

@@ -4,7 +4,7 @@ module Wocker
   module Cli
     class PortCommand < Clamp::Command
       def execute
-        Wocker::Vagrantfile.run "port"
+        Wocker::Vagrant.run "port"
       end
     end
   end

data/lib/wocker/cli/ps_command.rb

@@ -4,7 +4,7 @@ module Wocker
   module Cli
     class PsCommand < Clamp::Command
       def execute
-        Wocker::Vagrantfile.run "status"
+        Wocker::Vagrant.run "status"
       end
     end
   end

data/lib/wocker/cli/restart_command.rb

@@ -4,7 +4,7 @@ module Wocker
   module Cli
     class RestartCommand < Clamp::Command
       def execute
-        Wocker::Vagrantfile.run "reload"
+        Wocker::Vagrant.run "reload"
       end
     end
   end

data/lib/wocker/cli/rm_command.rb

@@ -4,7 +4,7 @@ module Wocker
   module Cli
     class RmCommand < Clamp::Command
       def execute
-        Wocker::Vagrantfile.run "destroy", "-f"
+        Wocker::Vagrant.run "destroy", "-f"
       end
     end
   end

data/lib/wocker/cli/root_command.rb

@@ -19,6 +19,7 @@ module Wocker
       subcommand ["ps"], "ps", PsCommand
       subcommand ["port"], "port", PortCommand
       subcommand ["restart"], "restart", RestartCommand
+      subcommand ["init"], "init", InitCommand
 
       def self.run
         super

data/lib/wocker/cli/start_command.rb

@@ -4,7 +4,7 @@ module Wocker
   module Cli
     class StartCommand < Clamp::Command
       def execute
-        Wocker::Vagrantfile.run "up"
+        Wocker::Vagrant.run "up"
       end
     end
   end

data/lib/wocker/cli/stop_command.rb

@@ -4,7 +4,7 @@ module Wocker
   module Cli
     class StopCommand < Clamp::Command
       def execute
-        Wocker::Vagrantfile.run "suspend"
+        Wocker::Vagrant.run "suspend"
       end
     end
   end

data/lib/wocker/cli.rb

@@ -15,5 +15,6 @@ require_relative "cli/start_command"
 require_relative "cli/stop_command"
 require_relative "cli/ps_command"
 require_relative "cli/port_command"
+require_relative "cli/init_command"
 
 require_relative "cli/root_command"

data/lib/wocker/vagrant.rb

@@ -0,0 +1,31 @@
+require 'pty'
+
+module Wocker
+  module Vagrant
+    def self.run(*args)
+      stderr_reader, stderr_writer = IO.pipe
+
+      stdout,stdin,pid = PTY.spawn("vagrant", *args, err: stderr_writer.fileno)
+      stderr_writer.close
+      stdin_thr = Thread.new do
+        stdin.close
+      end
+
+      stdout_thr = Thread.new do
+        while line = stdout.gets
+          print line
+        end
+      end
+
+      stderr_thr = Thread.new do
+        while line = stderr_reader.gets
+          print line
+        end
+      end
+
+      stdin_thr.join
+      stdout_thr.join
+      stderr_thr.join
+    end
+  end
+end

data/lib/wocker/vagrantfile.rb

@@ -1,69 +1,25 @@
-require 'open3'
-require 'erb'
+require 'fileutils'
 
 module Wocker
-  module Vagrantfile
-    def self.run *args, interface: nil
-      wockerfile = Wockerfile.new "Wockerfile"
-      instructions = wockerfile.parse
-
-      from = instructions["from"]
-      runs = instructions["runs"]
-      ports = instructions["ports"]
-
-      self.create from: from, runs: runs, ports: ports, interface: interface
-
-      require "pty"
-
-      stderr_reader, stderr_writer = IO.pipe
-
-      stdout,stdin,pid = PTY.spawn("vagrant", *args, err: stderr_writer.fileno)
-      stderr_writer.close
-      stdin_thr = Thread.new do
-        stdin.close
-      end
-
-      stdout_thr = Thread.new do
-        while line = stdout.gets
-          print line
-        end
-      end
-
-      stderr_thr = Thread.new do
-        while line = stderr_reader.gets
-          print line
-        end
-      end
-
-      stdin_thr.join
-      stdout_thr.join
-      stderr_thr.join
-
-      self.remove
+  class Vagrantfile
+    def initialize(interface: nil, choco: false)
+      @interface = interface
+      @choco = choco
     end
 
-    private
-    def self.create(from:, runs:, ports:, interface: nil)
-      @wocker_from = from
-      @wocker_runs = runs
-      @wocker_ports = ports
-      @wocker_interface = interface
+    def create_from_wockerfile! *args
+      v = VagrantfileTemplate.new
+      v.wocker_from = Wockerfile.from
+      v.wocker_runs = Wockerfile.runs
+      v.wocker_ports = Wockerfile.ports
+      v.wocker_interface = @interface
+      v.wocker_installs = []
 
-      source_path = File.expand_path(
-        File.join(
-        __dir__,
-        "..","..",
-        "templates", "Vagrantfile"
-      ))
-      vagrantfile_template = File.read source_path
-      vagrantfile_contents = ERB.new(vagrantfile_template).result(binding)
-
-      File.write "Vagrantfile", vagrantfile_contents
-    end
+      if @choco
+        v.wocker_installs << File.join(Wocker.gem_root_path, "scripts", "wocker-install-chocolatey.ps1")
+      end
 
-    def self.remove
-      return if ENV["WOCKER_VAGRANTFILE_KEEP"] == "yes"
-      File.unlink "Vagrantfile"
+      File.write "Vagrantfile", v.render(File.read(File.join(Wocker.gem_root_path, "templates", "Vagrantfile")))
     end
   end
 end

data/lib/wocker/vagrantfile_template.rb

@@ -0,0 +1,10 @@
+require 'erb'
+module Wocker
+  class VagrantfileTemplate
+    attr_accessor :wocker_from, :wocker_interface, :wocker_ports, :wocker_installs, :wocker_runs
+
+    def render(template)
+      ERB.new(template).result(binding)
+    end
+  end
+end

data/lib/wocker/version.rb

@@ -1,3 +1,3 @@
 module Wocker
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/wocker/wockerfile.rb

@@ -1,23 +1,44 @@
-require_relative '../dockerfile_parser'
+require "yaml"
 
 module Wocker
-  class Wockerfile
-    def initialize(path)
-      @path = path
+  module Wockerfile
+    @@ports = []
+    @@runs = []
+    @@from = nil
+    @@workdir = nil
+
+    def self.ports
+      parse
+      @@ports
+    end
+    def self.runs
+      parse
+      @@runs
+    end
+    def self.from
+      parse
+      @@from
+    end
+    def self.workdir
+      parse
+      @@workdir
     end
 
-    def parse
-      contents = File.read @path
+    private
+    def self.parse
+      contents = File.read "Wockerfile"
       parsed = YAML.load contents
-      if parsed["ports"]
+      @@runs = parsed["runs"]
+      @@from = parsed["from"]
+      @@workdir = parsed["workdir"]
+
+      @@ports = if parsed["ports"]
         ports_split = []
         parsed["ports"].each do |port|
           ports_split << port.split(":")
         end
-        parsed.delete "ports"
-        parsed["ports"] = ports_split
+        ports_split
       end
-      parsed
     end
   end
 end

data/lib/wocker.rb

@@ -1,6 +1,16 @@
 module Wocker
+  def self.gem_root_path
+    File.expand_path(
+      File.join(
+        __dir__,
+        ".."
+      )
+    )
+  end
 end
 
 require_relative "wocker/version"
 require_relative "wocker/wockerfile"
+require_relative "wocker/vagrant"
 require_relative "wocker/vagrantfile"
+require_relative "wocker/vagrantfile_template"

data/{install-chocolatey.ps1 → scripts/wocker-install-chocolatey.ps1}

@@ -5,4 +5,3 @@ if (!(Test-Path $ChocoInstallPath)) {
 }
 
 choco feature disable --name showDownloadProgress
-$env:Path += ";C:\ProgramData\Chocolatey\bin"

data/templates/Vagrantfile

@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
     config.vm.network "public_network", bridge: "<%= @wocker_interface %>"
   <% end %>
   <% @wocker_ports.each do |wocker_port| %>
-  config.vm.network :forwarded_port, guest: <%= wocker_port[0] %>, host: <%= wocker_port[1] %>
+    config.vm.network :forwarded_port, guest: <%= wocker_port[0] %>, host: <%= wocker_port[1] %>
   <% end %>
   config.vm.provider "virtualbox" do |vb|
     vb.gui = true
@@ -35,6 +35,10 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: '&netsh "advfirewall" "set" "allprofiles" "state" "off"'
 
+  <% @wocker_installs.each do |wocker_install| %>
+    config.vm.provision "shell", path: "<%= wocker_install %>"
+  <% end %>
+
   <% @wocker_runs.each do |wocker_run| %>
     <% if wocker_run["inline"] %>
       config.vm.provision "shell", inline: '<%= wocker_run["inline"] %>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wocker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -79,31 +79,19 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
-- ".vagrant/machines/wocker/virtualbox/action_provision"
-- ".vagrant/machines/wocker/virtualbox/action_set_name"
-- ".vagrant/machines/wocker/virtualbox/box_meta"
-- ".vagrant/machines/wocker/virtualbox/creator_uid"
-- ".vagrant/machines/wocker/virtualbox/id"
-- ".vagrant/machines/wocker/virtualbox/index_uuid"
-- ".vagrant/machines/wocker/virtualbox/synced_folders"
-- ".vagrant/machines/wocker/virtualbox/vagrant_cwd"
-- ".vagrant/rgloader/loader.rb"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- Vagrantfile
-- Wockerfile
 - bin/console
 - bin/setup
 - exe/wocker
-- install-chocolatey.ps1
-- lib/dockerfile_parser.rb
 - lib/wocker.rb
 - lib/wocker/cli.rb
 - lib/wocker/cli/build_command.rb
 - lib/wocker/cli/exec_command.rb
+- lib/wocker/cli/init_command.rb
 - lib/wocker/cli/port_command.rb
 - lib/wocker/cli/ps_command.rb
 - lib/wocker/cli/restart_command.rb
@@ -112,9 +100,12 @@ files:
 - lib/wocker/cli/start_command.rb
 - lib/wocker/cli/stop_command.rb
 - lib/wocker/cli/version_command.rb
+- lib/wocker/vagrant.rb
 - lib/wocker/vagrantfile.rb
+- lib/wocker/vagrantfile_template.rb
 - lib/wocker/version.rb
 - lib/wocker/wockerfile.rb
+- scripts/wocker-install-chocolatey.ps1
 - templates/Vagrantfile
 - wocker.gemspec
 homepage: https://github.com/matti/wocker

data/.vagrant/machines/wocker/virtualbox/action_provision

@@ -1 +0,0 @@
-1.5:994104c6-3a87-4002-b0fe-95636fdc3e4d

data/.vagrant/machines/wocker/virtualbox/action_set_name

@@ -1 +0,0 @@
-1544907743

data/.vagrant/machines/wocker/virtualbox/box_meta

@@ -1 +0,0 @@
-{"name":"StefanScherer/windows_2019","version":"2018.11.22","provider":"virtualbox","directory":"boxes/StefanScherer-VAGRANTSLASH-windows_2019/2018.11.22/virtualbox"}

data/.vagrant/machines/wocker/virtualbox/creator_uid

@@ -1 +0,0 @@
-501

data/.vagrant/machines/wocker/virtualbox/id

@@ -1 +0,0 @@
-994104c6-3a87-4002-b0fe-95636fdc3e4d

data/.vagrant/machines/wocker/virtualbox/index_uuid

@@ -1 +0,0 @@
-8f81c9755061455d8d2494f4d5972017

data/.vagrant/machines/wocker/virtualbox/synced_folders

@@ -1 +0,0 @@
-{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/mpa/Library/Mobile Documents/com~apple~CloudDocs/Documents/dev/wocker","disabled":false,"__vagrantfile":true}}}

data/.vagrant/machines/wocker/virtualbox/vagrant_cwd

@@ -1 +0,0 @@
-/Users/mpa/Library/Mobile Documents/com~apple~CloudDocs/Documents/dev/wocker

data/.vagrant/rgloader/loader.rb

@@ -1,9 +0,0 @@
-# This file loads the proper rgloader/loader.rb file that comes packaged
-# with Vagrant so that encoded files can properly run with Vagrant.
-
-if ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]
-  require File.expand_path(
-    "rgloader/loader", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
-else
-  raise "Encoded files can't be read outside of the Vagrant installer."
-end

data/Vagrantfile

@@ -1,55 +0,0 @@
-# https://github.com/StefanScherer/docker-windows-box/blob/master/Vagrantfile
-Vagrant.configure("2") do |config|
-  config.vm.define "wocker"
-  config.vm.guest = "windows"
-
-  config.vm.box          = "StefanScherer/windows_2019"
-  config.vm.communicator = "winrm"
-  
-  
-  config.vm.network :forwarded_port, guest: 9516, host: 5555
-  
-  config.vm.provider "virtualbox" do |vb|
-    vb.gui = true
-    vb.linked_clone = true
-
-    vb.customize ["modifyvm", :id, "--memory", 2048]
-    vb.customize ["modifyvm", :id, "--cpus", 2]
-    vb.customize ["modifyvm", :id, "--vram", 128]
-    vb.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
-
-    if false
-      vb.customize ["modifyvm", :id, "--accelerate3d", "on"]
-      vb.customize ["modifyvm", :id, "--accelerate2dvideo", "on"]
-    end
-
-    # Guest additions requires optical driver
-    vb.customize ["storageattach", :id,
-                    "--storagectl", "IDE Controller",
-                    "--port", "0", "--device", "1",
-                    "--type", "dvddrive",
-                    "--medium", "emptydrive"]
-  end
-
-  config.vm.provision "shell", inline: '&netsh "advfirewall" "set" "allprofiles" "state" "off"'
-
-  
-    
-      config.vm.provision "shell", path: 'install-chocolatey.ps1'
-    
-  
-    
-      config.vm.provision "shell", inline: 'choco install -y ruby'
-    
-  
-    
-      config.vm.provision "shell", inline: 'choco install -y nircmd'
-    
-  
-    
-      config.vm.provision "shell", inline: 'gem install delirium-driver'
-    
-  
-
-  config.vm.provision :reload
-end

data/Wockerfile

@@ -1,8 +0,0 @@
-from: StefanScherer/windows_2019
-
-runs:
-  - path: install-chocolatey.ps1
-  - inline: choco install -y ruby
-  - inline: choco install -y nircmd
-ports:
-  - 9516:5555

data/lib/dockerfile_parser.rb

@@ -1,60 +0,0 @@
-# Encoding: utf-8
-# @author Nikolay Yurin <yurinnick@outlook.com>
-
-require 'yaml'
-
-# DockerfileParser main class
-class DockerfileParser
-  @commands = %w(FROM MAINTAINER RUN CMD EXPOSE ENV ADD COPY ENTRYPOINT
-                 VOLUME USER WORKDIR ONBUILD)
-
-  # Parse Dockerfile from specified path
-  # @return [Array<Hash>] parser Dockerfile
-  def self.load_file(path)
-    loads(File.read(path))
-  end
-
-  def self.loads(s)
-    dockerfile_array = split_dockerfile(s)
-    parse_commands(dockerfile_array).each_cons(2).map do |item|
-      process_steps(dockerfile_array, item[0], item[1][:index])
-    end
-  end
-
-  def self.split_dockerfile(str)
-    str.gsub(/(\s\\\s)+/i, '').gsub("\n", ' ').squeeze(' ').split(' ')
-  end
-
-  def self.parse_commands(dockerfile_array)
-    dockerfile_array.each_with_index.map do |cmd, index|
-      { index: index, command: cmd } if @commands.include?(cmd)
-    end.compact! << { index: dockerfile_array.length, command: 'EOF' }
-  end
-
-  def self.process_steps(dockerfile_array, step, next_cmd_index)
-    { command: step[:command],
-      params: split_params(
-        step[:command],
-        dockerfile_array[step[:index] + 1..next_cmd_index - 1]
-      )
-    }
-  end
-
-  def self.split_params(cmd, params)
-    case cmd
-    when 'FROM' then params.join('').split(':')
-    when 'RUN' then params.join(' ').split(/\s(\&|\;)+\s/).map(&:strip)
-    when 'ENV' then
-      { name: params[0], value: params[1..-1].join(' ') }
-    when 'COPY', 'ADD' then { src: params[0], dst: params[1] }
-    else
-      params = params.join(' ') if params.is_a?(Array)
-      YAML.load(params.to_s)
-    end
-  end
-
-  private_class_method :parse_commands
-  private_class_method :process_steps
-  private_class_method :split_params
-  private_class_method :split_dockerfile
-end