docker-runner 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c922e4be88775142c1940bf163272b4323abb756
-  data.tar.gz: a18982c3960b9466baa51df30b6555e9ae3fa433
+  metadata.gz: d9ba1c187306ebe03331ed95d0b46aa17d46054d
+  data.tar.gz: 4c0011e49704208b423735b85eaeedbe6451bdf5
 SHA512:
-  metadata.gz: f92c3643aeece1712cc6eba42e37cead1c749ecfb773e86704a6ea66293e7142c655a6244d3e7134936134136aae95742fe8fef42d8dba81a57676d12c431cba
-  data.tar.gz: 0a6488b68daa8eb3ec4a1288e36a405ff81aea296c84a518c54bdafd42c3f808a9ddf2303ff362a1b67555e1c9f297deaa409c5cd633ce11ebe135b0fbe36c8b
+  metadata.gz: c815fb8d8d3190bc764d80410387c779532520982018f0f70b97fc5dc1c9c30e419d57f53b7c07450a8479da9145c9e1b40d8e80b8ee489bcb02be9100d5d3dd
+  data.tar.gz: 551667a63fb0aea99c70fc55f95846cb2c49a93164b802b4d6cbc384fb0cac662181c506bfa5c8742c6330db325bbb7ca2315cbcbdc5a3b0da45eeb720f91e7c

data/README.md

@@ -9,16 +9,23 @@ A Rails Like Docker Runner Cli
     
 ## Commands List
 
-  1. [docker-runner setup](#commands-list)
-  2. [docker-runner new [project]](#commands-list)
-  3. [docker-runner config](#commands-list)
-  4. [docker-runner build](#commands-list)
-  5. [docker-runner push](#commands-list)
-  6. [docker-runner login](#commands-list)
-  7. [docker-runner logout](#commands-list)
-  8. [docker-runner console](#commands-list)
-  9. [docker-runner update](#commands-list)
-  10. [docker-runner version](#commands-list)
+  ~~~
+  $ docker-runner
+  Usage:
+  - docker-runner new [project_name]    新建一个镜像
+  - docker-runner setup                 执行环境初始化
+  - docker-runner reset                 重置执行环境
+  - docker-runner config                查看当前执行环境
+  - docker-runner build                 构建镜像
+  - docker-runner push                  推送镜像到远程仓库
+  - docker-runner login                 登录镜像远程仓库
+  - docker-runner logout                退出镜像远程仓库
+  - docker-runner console               开启镜像控制台
+  - docker-runner update                更新镜像模板
+  - docker-runner version               查看当前版本
+    
+  docker-runner v0.1.0 (c) 2016 @caishuo
+  ~~~
 
 ## 使用说明
 

data/bin/docker-runner

@@ -5,8 +5,8 @@ require 'docker/runner'
 bin_dir = File.expand_path(File.dirname(__FILE__))
 shell_script_path = File.join(bin_dir, 'include', 'docker-runner.sh')
 
-if ARGV[0] == 'version'
+if ARGV[0] == 'version' or ARGV[0] == '-v'
   puts Docker::Runner::ABOUT
 else
-  puts `#{shell_script_path} #{ARGV * ' '}`
+  `VERSION='#{Docker::Runner::ABOUT}' #{shell_script_path} #{ARGV * ' '} >&2`
 end

data/bin/include/docker-runner.sh

@@ -9,6 +9,9 @@ case "$1" in
   setup)
     do_setup
     ;;
+  reset)
+    do_reset
+    ;;
   config)
     do_config
     ;;
@@ -27,14 +30,34 @@ case "$1" in
     do_logout
     ;;
   console)
-    docker_opts=${@%shell}
+    docker_opts=${@%console}
     do_console
     ;;
+  clean)
+    do_clean
+    ;;
   update)
     do_update
     ;;
   *)
-    echo "Usage: $NAME {new|setup|config|build|push|login|logout|console|update|version}" >&2
+    echo -e "\
+Usage:\n\
+  - docker-runner new [project_name]    新建一个镜像\n\
+  - docker-runner setup                 执行环境初始化\n\
+  - docker-runner reset                 重置执行环境\n\
+  - docker-runner config                查看当前执行环境\n\
+  - docker-runner build                 构建镜像\n\
+  - docker-runner push                  推送镜像到远程仓库\n\
+  - docker-runner login                 登录镜像远程仓库\n\
+  - docker-runner logout                退出镜像远程仓库\n\
+  - docker-runner console               开启镜像控制台\n\
+  - docker-runner clean                 Docker环境清理\n\
+  - docker-runner update                更新镜像模板\n\
+  - docker-runner version               查看当前版本\n\
+    " >&2
+    if [ '$VERSION' != '' ]; then
+      echo $VERSION >&2
+    fi
     exit 3
     ;;
 esac

data/bin/include/functions.sh

@@ -70,31 +70,45 @@ print_env() {
 }
 
 print_global_env() {
-  if [ -r "$HOME/.docker-runner" ]; then
+  if require_global_env; then
     echo "全局变量:"
     cat $HOME/.docker-runner
-  else
-    echo "找不到全局 ~/.docker-runner 文件, 请执行 docker-runner init"
   fi
 }
 
 print_project_env() {
-  if [ -r ".docker-runner" ]; then
+  if require_project_env; then
     echo "项目变量:"
     cat .docker-runner
-  else
-    echo "当前目录找不到 .docker-runner 文件"
   fi
 }
 
 # 重置全局变量
-rest_global_env() {
+reset_global_env() {
   ask_global_env
   set_default_global_env
   save_global_env
   print_global_env
 }
 
+require_global_env() {
+  if [ -r "$HOME/.docker-runner" ]; then
+    return 1
+  else
+    echo "**请先执行docker-runner setup, 进行环境初始化"
+    exit 11
+  fi
+}
+
+require_project_env() {
+  if require_global_env && [ -r ".docker-runner" ]; then
+    return 1
+  else
+    echo "**当前目录不是镜像项目, 请切换至镜像项目"
+    exit 12
+  fi
+}
+
 #------------------------------------------------------------------------------
 # 2. 环境变量默认值处理:
 #------------------------------------------------------------------------------
@@ -275,6 +289,11 @@ valid_variables() {
 }
 
 set_image_name() {
+  if ! require_project_env; then
+    echo '**当前目录不是镜像项目, 请切换至镜像项目'
+    exit 3
+  fi
+
   if [ $username = $OFFICIAL_USER ]; then
     img="$docker_host/$image:${version:-latest}"
   else
@@ -283,7 +302,7 @@ set_image_name() {
 }
 
 build_image() {
-  set_image_name
+  set_image_name && \
   (docker build $docker_opts -t $img .) && \
   echo $img was built successfully  
 }
@@ -299,6 +318,7 @@ push_image() {
 #------------------------------------------------------------------------------
 
 docker_login() {
+  echo "正在登录$docker_host:"
   read -p "用户名($(default_username)): " username
   echo "docker login -u ${username:=$(default_username)} -e $email $docker_host"
   docker login -u ${username:=$(default_username)} -e $email $docker_host
@@ -309,10 +329,16 @@ docker_logout() {
 }
 
 docker_console() {
-  set_image_name
+  set_image_name && \
   docker run -i -t --rm --name ${NAME:-tmp} $docker_opts $img /bin/sh
 }
 
+docker_clean() {
+  echo '[开始清理container]' && docker rm `docker ps -a | grep Exited | awk '{print $1 }'`
+  echo '[开始清理image]' && docker rmi $(docker images | grep "^<none>" | awk "{print $3}")
+  echo '[开始清理volume]' && docker volume rm $(docker volume ls -qf dangling=true)
+}
+
 #------------------------------------------------------------------------------
 # Public API
 #------------------------------------------------------------------------------
@@ -329,11 +355,24 @@ do_new_project() {
 }
 
 do_setup() {
-  rest_global_env
-  echo ''
+  reset_global_env
   do_login
 }
 
+do_reset() {
+  echo "该操作将删除已有配置"
+  read -p "确认是否进行: (Y/n)      " is_reset_env
+  if ([ "$is_reset_env" = '' ] || [ "$is_reset_env" = 'Y' ] || [ "$is_reset_env" = 'y' ]); then
+    rm -f "$HOME/.docker-runner"
+    unset gitlab_token
+    echo "清理成功, 开始重置..."
+    do_setup
+    echo "重置成功"
+  else
+    echo 停止执行环境重置
+  fi
+}
+
 do_config() {
   print_env
 }
@@ -360,6 +399,10 @@ do_console() {
   docker_console
 }
 
+do_clean() {
+  docker_clean
+}
+
 do_update() {
   update_template
 }

data/docker-runner.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = ['docker-runner']
   spec.require_paths = ["lib"]
 
+  spec.post_install_message = "\033[41;37m [Important] run \`docker-runner setup\`, before using \033[0m "
+  # spec.post_install_message = `docker-runner`
+
   spec.add_dependency 'gitlab'
 
   spec.add_development_dependency "bundler", "~> 1.11"

data/lib/docker/runner.rb

@@ -2,7 +2,7 @@ require 'docker/runner/version'
 
 module Docker
   module Runner
-    ABOUT     = "docker-runner v#{VERSION} (c) 2016 @caishuo.com".freeze
+    ABOUT     = "docker-runner v#{VERSION} (c) 2016 @caishuo".freeze
     PROCLINE  = "docker-runner v#{VERSION}".freeze
   end
 end

data/lib/docker/runner/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Runner
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - "王长明"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -76,7 +76,8 @@ homepage: https://gitlab.caishuo.com/docker/docker-runner
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\e[41;37m [Important] run `docker-runner setup`, before using
+  \e[0m "
 rdoc_options: []
 require_paths:
 - lib