Hitcher 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2cbf0d48e66e6f6bc3fddf5d9e1f657a5aa192c85739ce55bc74798e675659c
-  data.tar.gz: 4d428da2612f0bee76e0d68730872f13c2d777d15cca7b3a242ffda9dec0e6fc
+  metadata.gz: b4275c06412c3d90bac03253c5b1bbe1db7c9f93b50633ae958399d0b2d90cae
+  data.tar.gz: 96b478a0675d06a473512e2b8b2c8012b1fa02024f7c5cdcf060b0b3b00c63da
 SHA512:
-  metadata.gz: 54bacc6f28688e9a0e443f7454e5b90ab9b865f5dbbdffcf943d7054e805b349df3ba7f088692fccc7edbba0140d2b3097dc0b00d785527cd8378c8c4204f1e5
-  data.tar.gz: bdb939ffb28b67d8173f154f57920b63a4bd1ceef1faafbf65704a7805caffb0d61cdc6e05d222acceb83b6c95a14b35277a72bed2ec850713e3939f938b1014
+  metadata.gz: 48c14ba0c31c7d4ba4d0147fb3e97f8f5033e339062421ffa0d0b6f7a3dad3909a59208e435a5b3d7c3626c0faf3f48d5dc4dc42caa04fd9d814a35ad51ddc2b
+  data.tar.gz: ddec925b0c46c179ceddbb4fe1dae9eff2bcf70c404b7b6d31f2714beb85935b894ccb7649d5c3a4310f1973338e405666fea0d2a4016cc474b1d04c19a63573

data/cspec

@@ -10,7 +10,17 @@ tty true
 
 dockerfile do_plain
 FROM ruby-2_7_1
-RUN apt-get update && apt-get install -y yarn
+
+RUN apt-get update && apt-get install -y yarn #sudo && chmod u+s /usr/bin/sudo
+RUN groupadd -g $GID $USER && useradd -m $USER --uid=$UID --gid=$GID && passwd -d -u $USER && usermod -aG sudo $USER
+
+RUN cp /root/.bash_profile /home/$USER/.bash_profile && chown $USER:$USER /home/$USER/.bash_profile
+RUN cp /root/.bashrc /home/$USER/.bashrc && chown $USER:$USER /home/$USER/.bashrc
+RUN cp /root/.profile /home/$USER/.profile && chown $USER:$USER /home/$USER/.profile
+
+#USER $UID:$GID
+#WORKDIR /home/$USER
+
 CMD ["/bin/bash","--login"]
 #CMD ["/usr/share/rvm/rubies/ruby-2.7.1/bin/irb"]
 end
@@ -25,3 +35,4 @@ mount do_plain
   ../lib/acts_as_tree:/opt/dev-deps/acts_as_tree
 end
 
+

data/lib/hitcher/dsl.rb

@@ -12,8 +12,8 @@ module Hitcher
 
     def start(cont)
       cont.each do |c|
-        c = c.strip
-        if not c =~ /^#/ and not c.empty?
+        cc = c.strip
+        if not cc =~ /^#/ #and not c.empty?
           # ignoring comment  
           eeval(c)
         end

data/lib/hitcher/providers/docker/command_builder.rb

@@ -1,7 +1,7 @@
 
 require_relative '../../global'
 require 'toolrack'
-
+require 'etc'
 require 'ptools'
 
 module Hitcher
@@ -94,6 +94,9 @@ module Hitcher
         cmd << process_mount(opts)
         cmd << process_port(opts)
 
+        #userInfo = Etc.getpwnam(Etc.getlogin)
+        #cmd << "--user #{userInfo.uid}:#{userInfo.gid}"
+
         cmd << image
 
         if not_empty?(opts[:command])

data/lib/hitcher/providers/docker/dsl.rb

@@ -1,5 +1,7 @@
 
 require "toolrack"
+require 'etc'
+
 require_relative 'template'
 require_relative 'command_builder'
 require_relative 'command_runner'
@@ -47,8 +49,8 @@ module Hitcher
               # handle host:docker ==> /home/xxx/dev:/opt/dev
               ee = e.split(":")
               m = Mount.new
-              m.host = translate(ee[0])
-              m.docker = ee[1]
+              m.host = translate(ee[0].strip)
+              m.docker = ee[1].strip
               res << m
             end
           end
@@ -87,6 +89,8 @@ module Hitcher
     # class Dockerfile
     #
     class Dockerfile
+      include Antrapol::ToolRack::ConditionUtils
+
       attr_reader :cont
       def parse(blc)
         @cont = []
@@ -101,15 +105,45 @@ module Hitcher
               end
 
             elsif e.strip != "end"
-              @cont << e
+              @cont << translate(e.strip)
             end
           end
         end
+
       end
 
       def is_empty?
         @cont.nil? or @cont.empty?
       end
+
+      private
+      def translate(line)
+
+        if not line.strip.empty?
+          if line =~ /\$USER/
+            line = line.gsub("$USER", user_info.name)
+          end
+
+          if line =~ /\$UID/
+            line = line.gsub("$UID", "#{user_info.uid}")
+          end
+
+          if line =~ /\$GID/
+            line = line.gsub("$GID", "#{user_info.gid}")
+          end
+        end
+
+        line
+      end
+
+      def user_info
+        if @userInfo.nil?
+          login = Etc.getlogin
+          @userInfo = Etc.getpwnam(login)
+        end
+        @userInfo
+      end
+
     end # class Dockerfile
 
     ## 
@@ -196,13 +230,14 @@ module Hitcher
         
         te = Hitcher::Docker::TemplateEngine.new
 
-        if depth == :dockerfile or depth == :all and not @dockerfile.nil?
+        if (depth == :dockerfile or depth == :all) and not @df.nil?
           te.build_template(:dockerfile, { image: @image, dockerfile: @df.cont  })
           @logger.debug "Dockerfile generated"
         end
 
         if depth == :build_container or depth == :all
           te.build_template(:build_container, { image_name: @image })
+          @logger.debug "build_container generated"
         end
 
         if depth == :run_script or depth == :all

data/lib/hitcher/providers/docker/template.rb

@@ -15,7 +15,8 @@ module Hitcher
         case temp
         when :dockerfile
           path = File.join(File.dirname(__FILE__),"templates","Dockerfile.erb")
-          bind_template(path, File.join(dest_root,"Dockerfile"), val)
+          ccont = val[:dockerfile].join("\n")
+          bind_template(path, File.join(dest_root,"Dockerfile"), { dockerfile_content: ccont } )
         else
           if Antrapol::ToolRack::RuntimeUtils.on_windows?
             raise Hitcher::Error, "Not ready yet"

data/lib/hitcher/providers/docker/templates/Dockerfile.erb

@@ -1,6 +1,4 @@
 <%#-*- coding: utf-8 -*-%>
-<% dockerfile.each do |d| %>
-<%= d.strip if not d.strip.empty? %>
-<% end %>
+<%= dockerfile_content %>
 
 

data/lib/hitcher/version.rb

@@ -1,3 +1,3 @@
 module Hitcher
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Hitcher
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport