sct 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be150a1d5ddc9339df696d2f7db5d6056dfdba0fbb48884e57cfacc700b79ea
-  data.tar.gz: d6fc67a9a3af7c51bf542353f476ec59b60f1c40e7387da64910c4287be857c7
+  metadata.gz: 6c949eeff7191cb2699ed0ed1ba26559d7a47ca5111e154204b4e1da42356069
+  data.tar.gz: 7c021037a4e3fc764d011e7d2e76024344a6a2b3e05672de4bc5dc0cad985042
 SHA512:
-  metadata.gz: e5046d7b3acb18f4cce8b17b7a8d32586758dfda47ba696b7e0f36192fd5b51d132fe2a770768410728279c08b70ebfeb263a79b82bad5531d889b3fe0b733cc
-  data.tar.gz: 3502a15df6d47b547af6dc7a15cd175a23f45700c6771ccf66055542d2df2d21baadb7c26c03c0736d469ead3108c5b09f968adc318c1d572fa036fea047f454
+  metadata.gz: 9022840b61e7414056aef611325122d8c4e1c1dce4c370f99d2b67d5ddda35b9e395444ffc6b7d79b01d530d40117cfc08159148b276263d9b8958cce488e8c5
+  data.tar.gz: d5f967cd37ad3447f3566051894195b08ecda28773a95a9bdecc7f61bbb59efc339d6541c826b1f5a0efd6e06bc3519e1d1cce32c096b784ca1ad4518f71e0c3

data/cluster/lib/cluster/commands_generator.rb

@@ -63,15 +63,6 @@ module Cluster
         end
       end
 
-      command :pull do |c|
-        c.syntax = 'sct cluster pull'
-        c.description = 'pull new image versions'
-
-        c.action do |args, options|
-          Cluster::Runner.new.pull
-        end
-      end
-
       command :status do |c|
         c.syntax = 'sct cluster status'
         c.description = 'see the status of your cluster'

data/cluster/lib/cluster/runner.rb

@@ -50,11 +50,6 @@ module Cluster
       start args, options
     end
 
-    def pull
-      run_dc "pull"
-      run "docker image prune -f"
-    end
-
     def status
       run_dc "ps"
     end

data/sct/lib/sct/commands/dev.rb

@@ -3,24 +3,34 @@ require 'yaml'
 module Sct
   class DevCommand
 
+    @@file = "docker-compose.dev.yml"
+
     def error message
       UI.error message
       exit 1
     end
 
-    def execute args, options
-      file = "docker-compose.dev.yml"
+    def dc command
+      system "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+    end
 
-      if !File.exist? file
-        error "Could not find file '#{file}'."
+    def local_dc command
+      system "docker-compose -f #{@@file} #{command}"
+    end
+
+    def manifest
+      if !File.exist? @@file
+        error "Could not find file '#{@@file}'."
       end
 
-      manifest = YAML.load File.read file
+      YAML.load File.read @@file
+    end
 
+    def execute args, options
       services = manifest["services"].to_a
 
       if services.length != 1
-        error "Currently sct only supports a single service declaration in '#{file}'. Contact the infra guild if you consider this a limitation."
+        error "Currently sct only supports a single service declaration in '#{@@file}'. Contact the infra guild if you consider this a limitation."
       end
 
       service, service_spec = services.first
@@ -28,15 +38,23 @@ module Sct
       container = service_spec["container_name"]
       command = service_spec["command"] || ""
 
+      if options.pull
+        return unless local_dc "pull"
+      end
+
       if options.build
-        return unless system "docker-compose -f #{file} build #{options.pull ? "--pull" : ""}"
+        return unless local_dc "build --build-arg PUID=$(id -u) --build-arg PGID=$(id -g) #{options.pull ? "--pull" : ""}"
+      end
+
+      if options.pull or options.build
+        system "docker image prune -f"
       end
 
-      return unless system "docker-compose -f ~/development/spend-cloud/docker-compose.yml rm --stop --force #{service}"
+      return unless dc "rm --stop --force #{service}"
 
-      system "docker-compose -f #{file} run --rm --service-ports --name #{container} #{service} #{command}"
+      local_dc "run --rm --service-ports --name #{container} #{service} #{command}"
 
-      system "docker-compose -f ~/development/spend-cloud/docker-compose.yml up --detach #{service}"
+      dc "up --detach #{service}"
     end
 
   end

data/sct/lib/sct/commands_generator.rb

@@ -40,8 +40,8 @@ module Sct
             command :'dev' do |c|
                 c.syntax = 'sct dev'
                 c.description = 'start development container in the current directory'
-                c.option '--build', '(re)build image from Dockerfile before starting'
-                c.option '--pull', 'pull latest base image from Dockerfile before (re)building. only used in combination with --build flag'
+                c.option '--build', '(re)build images before starting'
+                c.option '--pull', 'pull latest images before starting'
 
                 c.action do |args, options|
                     Sct::DevCommand.new.execute args, options

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/shell/lib/shell/runner.rb

@@ -41,7 +41,7 @@ module Shell
         end
       end
 
-      system "docker exec -it #{container} #{command}"
+      system "docker exec -it --user $(id -u):$(id -g) #{container} #{command}"
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -237,10 +237,10 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
+- shell/lib
 - cluster/lib
 - sct/lib
 - sct_core/lib
-- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="