maril 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd5b74859d53f7614acf869a13a3bdd965134b7
-  data.tar.gz: 81cc3128b3bdfb40b57c485b5cea88ea7ef60c91
+  metadata.gz: 93388dd3ee1c7ee421e13f3385ce3da8ce159185
+  data.tar.gz: c5dc7f08a4487f18db14e9f543d2bd6d6ba44d17
 SHA512:
-  metadata.gz: dce412827bcfcf0e28636469b6184ac47be4d4ad62572a34d933e3c2335175ec4ec62078e87c6fec491a9a1eb6667f351dc0088bab98c5c45512b602e9d0d57f
-  data.tar.gz: 8ea45337cb9d73dad9ec9ead7eb37dc74f6b0bc3874d8f0ecd605a2c14103a850f04033e8ed0fbbda2a19ed367b766bef6b636b65c083e663d2c9cafc957381d
+  metadata.gz: 62b4232a83180f2c0a266fddc80083efc7c86e4404c4e62495264ea0aaa6459b66fd10be0394574f8ab514c701597d211f5c2e85e15624f23305848378db4af0
+  data.tar.gz: f94e7b19042302b76efb99a9059f18152a4ea1daa3b4c9338d8ff8b139f0ec6450a74b1b22ddf42398f7784666afc91f1f1c11db48581b649710e8385ada1ddd

data/README.md

@@ -6,14 +6,24 @@ Maril is abbreviation of "Marathon Application Run In Local". Which is a command
 
 Open your terminal and execute:
 
-    $ gem install maril
+```
+$ gem install maril
+```
+
+I also provide a greasemonkey userscript. It will add a button on your marathon application page. You just need to click it and the `docker run` command will be saved into your clipboard.
+
+![image](https://user-images.githubusercontent.com/21731/28947741-3bc76082-7877-11e7-8564-fed827369626.png)
+
+You can click [here](https://raw.githubusercontent.com/agate/maril/master/userscript/maril.user.js) to install it.
+
+> Remember: You have to either change `@match` or add new `@match` in this userscript to match your marathon site. So that this button can show up.
 
 ## Usage
 
 Open your terminal and run:
 
 ```
-$ maril http://your.marathon.domain /your/application/id
+$ maril --host http://your.marathon.domain --id /your/application/id
 ```
 
 ## Development

data/Rakefile

@@ -1,6 +1,19 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "erb"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+desc "Build maril.user.js"
+task "build_userscript" do
+  gemspec = Gem::Specification::load("maril.gemspec")
+  src_path = "userscript/maril.user.js.erb"
+  dis_path = "userscript/maril.user.js"
+  content = ERB.new(File.read(src_path)).result(binding)
+  File.write(dis_path, content)
+  puts "Compiled #{src_path} => #{dis_path}"
+end
+
+task "build" => "build_userscript"

data/lib/maril/generator.rb

@@ -7,7 +7,7 @@ module Maril
 
     def generate
       app = fetch_app
-      cmd = [ 'docker run' ]
+      cmd = [ 'docker run --rm -it' ]
       app['env'].each do |k, v|
         cmd << "-e #{k}=#{v}"
       end
@@ -19,7 +19,7 @@ module Maril
       end
       cmd << app['container']['docker']['image']
       cmd << app['cmd'] if app['cmd']
-      cmd.join(" \\\n")
+      cmd.join(" ")
     end
 
     private

data/lib/maril/version.rb

@@ -1,3 +1,3 @@
 module Maril
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/userscript/maril.user.js

@@ -0,0 +1,66 @@
+// ==UserScript==
+// @name         Maril
+// @namespace    https://github.com/agate/maril
+// @version      0.1.1
+// @description  Marathon Application Run In Local
+// @author       agate<agate.hao@gmail.com>
+// @match        http://PUT.YOUR.MARATHON.DOMAIN.HERE/*
+// @grant        GM_xmlhttpRequest
+// @grant        GM_setClipboard
+// ==/UserScript==
+
+(function() {
+  'use strict';
+
+  let currentAppId = null;
+
+  const generateDockerCmd = () => {
+    let url = `${location.origin}/v2/apps${currentAppId}`;
+    GM_xmlhttpRequest({
+      method: "GET",
+      url: url,
+      onload: function(response) {
+        let app = JSON.parse(response.responseText).app;
+        let cmd = [ "docker run --rm -it" ];
+
+        for (var key in app.env) {
+          cmd.push(`-e ${key}=${app.env[key]}`);
+        }
+        app.container.docker.parameters.forEach((parameter) => {
+          cmd.push(`--${parameter.key} ${parameter.value}`);
+        });
+        app.container.docker.portMappings.forEach((mapping) => {
+          cmd.push(`-p ${mapping.containerPort}:${mapping.containerPort}`);
+        });
+        cmd.push(app.container.docker.image);
+
+        GM_setClipboard(cmd.join(" "));
+        alert("Already saved the docker run command into your clipboard.");
+      },
+      onerror: (response) => {
+        alert("error");
+      }
+    });
+  };
+
+  const attachButton = () => {
+    let hash = window.location.hash.slice(1);
+    if (hash.match(/^\/apps\/[^/]+$/)) {
+      let appId = decodeURIComponent(hash.slice(6));
+      if (currentAppId != appId) {
+        currentAppId = appId;
+        let parentEle = document.querySelector('.header-btn');
+        let btn = document.createElement('a');
+        let btnTxt = document.createTextNode("Generate Docker CMD");
+        btn.setAttribute("class", "btn btn-lg btn-default");
+        btn.style["margin-left"] = "5px";
+        btn.appendChild(btnTxt);
+        btn.addEventListener("click", generateDockerCmd, false);
+        parentEle.appendChild(btn);
+      }
+    }
+  };
+
+  window.addEventListener("hashchange", attachButton, false);
+  attachButton();
+})();

data/userscript/maril.user.js.erb

@@ -0,0 +1,66 @@
+// ==UserScript==
+// @name         Maril
+// @namespace    https://github.com/agate/maril
+// @version      <%= gemspec.version %>
+// @description  <%= gemspec.summary %>
+// @author       <%= gemspec.authors.map.with_index{ |a, i| "#{a}<#{gemspec.email[i]}>" }.join(", ") %>
+// @match        http://PUT.YOUR.MARATHON.DOMAIN.HERE/*
+// @grant        GM_xmlhttpRequest
+// @grant        GM_setClipboard
+// ==/UserScript==
+
+(function() {
+  'use strict';
+
+  let currentAppId = null;
+
+  const generateDockerCmd = () => {
+    let url = `${location.origin}/v2/apps${currentAppId}`;
+    GM_xmlhttpRequest({
+      method: "GET",
+      url: url,
+      onload: function(response) {
+        let app = JSON.parse(response.responseText).app;
+        let cmd = [ "docker run --rm -it" ];
+
+        for (var key in app.env) {
+          cmd.push(`-e ${key}=${app.env[key]}`);
+        }
+        app.container.docker.parameters.forEach((parameter) => {
+          cmd.push(`--${parameter.key} ${parameter.value}`);
+        });
+        app.container.docker.portMappings.forEach((mapping) => {
+          cmd.push(`-p ${mapping.containerPort}:${mapping.containerPort}`);
+        });
+        cmd.push(app.container.docker.image);
+
+        GM_setClipboard(cmd.join(" "));
+        alert("Already saved the docker run command into your clipboard.");
+      },
+      onerror: (response) => {
+        alert("error");
+      }
+    });
+  };
+
+  const attachButton = () => {
+    let hash = window.location.hash.slice(1);
+    if (hash.match(/^\/apps\/[^/]+$/)) {
+      let appId = decodeURIComponent(hash.slice(6));
+      if (currentAppId != appId) {
+        currentAppId = appId;
+        let parentEle = document.querySelector('.header-btn');
+        let btn = document.createElement('a');
+        let btnTxt = document.createTextNode("Generate Docker CMD");
+        btn.setAttribute("class", "btn btn-lg btn-default");
+        btn.style["margin-left"] = "5px";
+        btn.appendChild(btnTxt);
+        btn.addEventListener("click", generateDockerCmd, false);
+        parentEle.appendChild(btn);
+      }
+    }
+  };
+
+  window.addEventListener("hashchange", attachButton, false);
+  attachButton();
+})();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maril
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - agate
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,8 @@ files:
 - lib/maril/generator.rb
 - lib/maril/version.rb
 - maril.gemspec
+- userscript/maril.user.js
+- userscript/maril.user.js.erb
 homepage: https://github.com/agate/maril
 licenses:
 - MIT