shuttl 0.3.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c943490fc4be7bb013e3d0a2a64bd088f8d3f24
-  data.tar.gz: 58036ff0a9c6e2deb3778aa2a1d41820f9d82459
+  metadata.gz: b3a44e2acfa4fe0c9838957467204492817ebbea
+  data.tar.gz: 840f8d2ce636a8ac992eb6da647ca155409598a8
 SHA512:
-  metadata.gz: d0d06d01e13fe953f01789ed75a6e7fde6c80031c10440cf36048a7bab7c9a52266ce2e7350449b3fb82c93763bd2dedab50623cfd1706b6be890d4360a8c3ea
-  data.tar.gz: 775b289b68e3d59055a5c7cc7f942a8fe692445ca56b6212f8676739929c4bfc4597e5241a50ba25f08915cc092208987493a65963f98387cb01879289c4316d
+  metadata.gz: 76286e0fe12caeccc15725facc40b1fafb69fa944f0a1bd92eee6550cf69850112eb0a95b1fbff317f40914909717058de4870c103d0e06862e038b7a26701a5
+  data.tar.gz: d19194484e50c531704f3b6d0dff5e78bf521160ac1ae758ca05bf9ffa75a7b30b157be4e11b71d6506ce4c6008937692313a66399b5da3aa9ab098bc4247b75

data/bin/shuttl

@@ -11,6 +11,8 @@ require_relative '../src/commands/run'
 require_relative '../src/commands/ssh'
 require_relative '../src/commands/deploy'
 require_relative '../src/commands/install'
+require_relative '../src/commands/login'
+require_relative '../src/commands/launch'
 require_relative '../src/settings'
 
 Docker.validate_version!
@@ -120,6 +122,29 @@ subcommands = Hash[
             end
         end,
         :runner => Install.new
+    },
+    'login' => {
+        :opts => OptionParser.new do |opts|
+        end,
+        :runner => Login.new
+    },
+    'launch' => {
+        :opts => OptionParser.new do |opts|
+            opts.banner = "Launch a new service using a given image"
+            opts.on('-i IMAGENAME', '--image IMAGENAME', 'The image for the service') do |imageName|
+                options[:imageName] = imageName
+            end
+            opts.on('-n SERVICENAME', '--name SERVICENAME', 'The name for the service') do |serviceName|
+                options[:serviceName] = serviceName
+            end
+            opts.on('-h HOST', '--host HOST', 'the host the service will be under') do |host|
+                options[:host] = host
+            end
+            opts.on('-s SCHEME', '--scheme SCHEME', 'the scheme for the host') do |scheme|
+                options[:scheme] = scheme
+            end
+        end,
+        :runner => Launch.new
     }
 ]
 

data/src/api/Api.rb

@@ -0,0 +1,17 @@
+require_relative 'HTTPAdapter'
+
+class ShuttlAPI < HTTPAdapter
+    def login(username, password)
+        post('/api/login', {"username": username, "password": password})
+    end
+
+    def launch(imageName, serviceName, host, scheme)
+        post('/api/launch', {
+            :imageName => imageName,
+            :serviceName => serviceName,
+            :routeRules => {
+                :host => host,
+            }
+        })
+    end
+end

data/src/api/Exceptions.rb

@@ -0,0 +1,9 @@
+class APIError < StandardError
+    attr_accessor :response
+    def initialize (resp)
+        @response = resp
+    end
+end
+
+class NotFound < APIError
+end

data/src/api/HTTPAdapter.rb

@@ -0,0 +1,43 @@
+require 'net/http'
+require 'json'
+
+require_relative "./Exceptions"
+
+class HTTPAdapter
+    def initialize (url, headers=Hash[])
+        @url = URI(url)
+        @headers = headers
+        @http = Net::HTTP.new(@url.host, @url.port)
+    end
+
+    def get(url, params=nil, headers=Hash[])
+        headers = @headers.merge headers
+        url = URI("#{@url}#{url}")
+        if !params.nil?
+            url.query = URI.encode_www_form(params)
+        end
+        res = Net::HTTP::Get.new(url.request_uri)
+        headers.map do |headerName, headerValue|
+            res[headerName] = headerValue
+        end
+        res = @http.request(res)
+        raise NotFound.new(res) if res.is_a?(Net::HTTPNotFound)
+        raise APIError.new(res) if !res.is_a?(Net::HTTPSuccess)
+        JSON.parse(res.body)
+    end
+
+    def post(url, body=Hash[], headers=Hash[])
+        headers = @headers.merge headers
+        puts headers
+        url = URI("#{@url}#{url}")
+        res = Net::HTTP::Post.new(url.request_uri, 'Content-Type' => 'application/json')
+        res.body = body.to_json
+        headers.map do |headerName, headerValue|
+            res[headerName] = headerValue
+        end
+        res = @http.request(res)
+        raise NotFound.new(res) if res.is_a?(Net::HTTPNotFound)
+        raise APIError.new(res) if !res.is_a?(Net::HTTPSuccess)
+        JSON.parse(res.body)
+    end
+end

data/src/commands/base.rb

@@ -7,6 +7,11 @@ class CommandBase
             @info = JSON.parse(fi.read)
         end
         @cwd = Dir.getwd
+        auth = {}
+        if @info.key?('token')
+            auth = {'Authorization': "Token #{@info['token']}"}
+        end
+        @api = ShuttlAPI.new ShuttlSettings::APIURL, auth
     end
 
     def handle (options, args)

data/src/commands/launch.rb

@@ -0,0 +1,20 @@
+require 'colorize'
+require 'io/console'
+
+require_relative '../api/Api'
+require_relative '../settings'
+require_relative "../api/Exceptions"
+require_relative 'base'
+
+class Launch < CommandBase
+    
+    def run (options)
+        begin
+            @api.launch(options[:imageName], options[:serviceName], options[:host], options[:scheme])
+        rescue APIError => e
+            puts e.response.body
+        end
+            
+    end
+
+end

data/src/commands/login.rb

@@ -0,0 +1,26 @@
+require 'colorize'
+require 'io/console'
+
+require_relative '../api/Api'
+require_relative '../settings'
+require_relative "../api/Exceptions"
+require_relative 'base'
+
+class Login < CommandBase
+    
+    def run (options)
+        print "Username: "
+        userName = gets.chomp
+        print "Password (You won't see any typing):"
+        password = STDIN.noecho(&:gets).chomp
+        puts ""
+        begin
+            resp = @api.login(userName, password)
+            @info['token'] = resp["token"]
+            puts "Login successful!".green
+        rescue NotFound
+            $stderr.puts "username or password is incorrect".red
+        end
+    end
+
+end

data/src/dsl/Shuttl.rb

@@ -48,6 +48,7 @@ class Shuttl
 
     def ENTRYPOINT (entrypoint)
         @builder.entrypoint = entrypoint
+        self.add "ENTRYPOINT #{entrypoint}"
     end
 
     def ONSTART (cmd)
@@ -97,4 +98,8 @@ class Shuttl
     def CMD (cmd)
         @builder.cmd cmd
     end
+
+    def USER (user)
+        self.add "USER #{user}"
+    end
 end

data/src/dsl/buildContext.rb

@@ -94,9 +94,9 @@ class Builder
         end
         definition = @buildSettings[:docker]
         definition = [definition[0], ] + settingsArr + definition[1..definition.count]
-        if @entrypoint
-            definition << "ENTRYPOINT #{@entrypoint}"
-        end
+        # if @entrypoint
+        #     definition << "ENTRYPOINT #{@entrypoint}"
+        # end
         volumes = gatherVolume stage
         definition << "RUN echo 'echo SHUTTL IMAGE BOOTED' >> /.shuttl/run"
         definition << "RUN echo 'bash /.shuttl/start' >> /.shuttl/run"

data/src/settings.rb

@@ -1,4 +1,5 @@
 module ShuttlSettings
-    VERSION = "0.3.2"
+    VERSION = "0.4.3"
     BUILD = 1
+    APIURL='http://172.17.0.4/'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shuttl
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yoseph Radding
@@ -74,11 +74,16 @@ files:
 - bin/shuttl
 - src/Shuttl/Loader.rb
 - src/Shuttl/Shuttl.rb
+- src/api/Api.rb
+- src/api/Exceptions.rb
+- src/api/HTTPAdapter.rb
 - src/commands/base.rb
 - src/commands/build.rb
 - src/commands/deploy.rb
 - src/commands/info.rb
 - src/commands/install.rb
+- src/commands/launch.rb
+- src/commands/login.rb
 - src/commands/run.rb
 - src/commands/ssh.rb
 - src/commands/start.rb