magellan-cli 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe639545cc422de3632c16deacd1a9081fe0a37d
-  data.tar.gz: 022da8e08cc29ac43e162c433439f378b5d3cee8
+  metadata.gz: b50c83378c4c2e7c8992abde1d7c6b6eb2b712c2
+  data.tar.gz: 3e193a9ab5f4f00afa3571ba160219574cb3d3bb
 SHA512:
-  metadata.gz: 74b31f9bb8ae7f7ddee9c63090bc153178766ed0b31347b23c6c23ae5c37f6b05576137dd05fdf7eb28f6f91321432f0b58ced2c0f61f753d89b0be1e9d9da67
-  data.tar.gz: 7a78d27190c4284673231bb57b049b9f598300232c03b1bcb2303697e1ba448f4e099e7fc5248581c30dd83d74250cc6b6d831cfc7247c850cd36a3dddb76770
+  metadata.gz: 140f87071bb2401945d826685ac7892a8da9c6ae8a1af162cea849e5e12e009d01b108d96dea472af50fe84bf556417c8cd6986fdec968733d2406690ca7eb17
+  data.tar.gz: 5cc732c2b875cc9d8425d6149824ff122cb3fff887009842b2c5940e29f51931fa69505303dddb3412ef6e2b28010086e4f1035e39ea5d86769b8bec870d2ce0

data/.gitignore

@@ -13,3 +13,4 @@
 mkmf.log
 .magellan-cli
 worker.yml
+worker2.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.1.0)
+    magellan-cli (0.2.0)
       activesupport (~> 4.1.4)
       httpclient
       nokogiri

data/lib/magellan/cli.rb

@@ -15,6 +15,7 @@ module Magellan
     autoload :Error     , "magellan/cli/errors"
     autoload :LoginError, "magellan/cli/errors"
 
+    autoload :FileAccess, "magellan/cli/file_access"
     JSON_HEADER = {
       "Content-Type" => "application/json"
     }.freeze

data/lib/magellan/cli/command.rb

@@ -6,12 +6,15 @@ require 'active_support/core_ext/string/inflections'
 module Magellan
   module Cli
     class Command < Base
+      include Magellan::Cli::FileAccess
 
       {
+        "organization"  => "Organization",
+        "team"          => "Team",
         "project"       => "Project",
         "stage"         => "Stage",
         "client_version" => "ClientVersion",
-        "function_unit" => "FunctionUnit",
+        "tr"            => "TransactionRouter",
         "worker"        => "WorkerVersion",
         "instance"      => "HostInstance",
         "image"         => "ContainerImage",
@@ -24,6 +27,15 @@ module Magellan
       desc "direct SUBCOMMAND ...ARGS", "send request directly"
       subcommand "direct", ::Magellan::Cli::Direct
 
+      desc "login", "login to a Magellan API server"
+      def login
+        print "email: "
+        email = STDIN.gets.chomp
+        print "password: "
+        password = STDIN.noecho(&:gets).chomp
+        puts ""
+        update_selections("login" => {"email" => email, "password" => password})
+      end
     end
   end
 end

data/lib/magellan/cli/file_access.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+module Magellan
+  module Cli
+    module FileAccess
+
+      class NotSelected < StandardError
+      end
+
+      def load_selections
+        File.readable?(".magellan-cli") ? YAML.load_file(".magellan-cli") : {}
+      end
+
+      def load_selection(name)
+        sel = load_selections
+        s = sel[name]
+        raise NotSelected, "No #{name} selected" unless s
+        return s
+      end
+
+      def update_selections(hash = nil)
+        sel = load_selections
+        sel.update(hash) if hash
+        yield(sel) if block_given?
+        open(".magellan-cli", "w") do |f|
+          f.chmod 0600
+          YAML.dump(sel, f)
+        end
+      end
+    end
+  end
+end

data/lib/magellan/cli/http.rb

@@ -16,12 +16,12 @@ module Magellan
         end
 
         # ログインしてGETします
-        # @param [String] rel_path cli.base_https_url からの相対パス
+        # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params クエリ文字列
         # @return [Object] レスポンスのBODYをJSONとしてパースした結果オブジェクト
         def get_json(rel_path, params = nil)
           login do |cli|
-            url = "#{cli.base_https_url}#{rel_path}"
+            url = "#{cli.base_url}#{rel_path}"
             if params && !params.empty?
               url << '?' << params.map{|k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
             end
@@ -32,7 +32,7 @@ module Magellan
         end
 
         # ログインしてPOSTします
-        # @param [String] rel_path cli.base_https_url からの相対パス
+        # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params POSTで渡されるパラメータ
         # @return nil
         def post(rel_path, params)
@@ -43,7 +43,7 @@ module Magellan
         end
 
         # ログインしてJSON形式のbodyをPOSTします
-        # @param [String] rel_path cli.base_https_url からの相対パス
+        # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params POSTで渡されるパラメータ
         # @return nil
         def post_json(rel_path, params)
@@ -54,7 +54,7 @@ module Magellan
         end
 
         # ログインしてPUTします
-        # @param [String] rel_path cli.base_https_url からの相対パス
+        # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params PUTで渡されるパラメータ
         # @return nil
         def put(rel_path, params)
@@ -65,7 +65,7 @@ module Magellan
         end
 
         # ログインしてJSON形式のbodyをPUTします
-        # @param [String] rel_path cli.base_https_url からの相対パス
+        # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params PUTで渡されるパラメータ
         # @return nil
         def put_json(rel_path, params)
@@ -76,7 +76,7 @@ module Magellan
         end
 
         # ログインしてDELETEします
-        # @param [String] rel_path cli.base_https_url からの相対パス
+        # @param [String] rel_path cli.base_url からの相対パス
         # @return nil
         def delete(rel_path)
           login do |cli|
@@ -86,7 +86,7 @@ module Magellan
         end
 
         def process_res(cli, http_method, rel_path, *args)
-          res = cli.httpclient.send(http_method, "#{cli.base_https_url}#{rel_path}", *args)
+          res = cli.httpclient.send(http_method, "#{cli.base_url}#{rel_path}", *args)
           case res.status
           when 200...300 then
             r = JSON.parse(res.body)

data/lib/magellan/cli/login.rb

@@ -11,6 +11,7 @@ require 'active_support/core_ext/hash/keys'
 module Magellan
   module Cli
     class Login
+      include Magellan::Cli::FileAccess
 
       PRODUCTION_HTTP_PORT  =  80
       PRODUCTION_HTTPS_PORT = 443
@@ -19,9 +20,7 @@ module Magellan
       DEFAULT_HTTPS_PORT = (ENV['DEFAULT_HTTPS_PORT'] || 443).to_i
 
       attr_reader :httpclient
-      attr_reader :base_http_url
-      attr_reader :base_https_url
-      attr_reader :ssl_disabled
+      attr_reader :base_url
 
       attr_reader :auth_token
 
@@ -30,41 +29,29 @@ module Magellan
       # @param [String] base_url_or_host 接続先の基準となるURLあるいはホスト名
       # @param [Hash] options オプション
       # @option options [String]  :api_version APIのバージョン。デフォルトは "1.0.0"
-      # @option options [Boolean] :ssl_disabled SSLを無効にするかどうか。
-      # @option options [Integer] :https_port HTTPSで接続する際の接続先のポート番号
       def initialize(base_url_or_host = nil, options = {})
         base_url_or_host ||= (ENV["MAGELLAN_SITE"] || "http://localhost:3000/")
         if base_url_or_host =~ URI.regexp
-          @base_http_url = base_url_or_host.sub(/\/\Z/, '')
-          uri = URI.parse(@base_http_url)
+          @base_url = base_url_or_host.sub(/\/\Z/, '')
+          uri = URI.parse(@base_url)
         else
           if config_path = search_file(".magellan-cli.yml")
             config = YAML.load_file_with_erb(config_path)
             options = config[base_url_or_host.to_s].deep_symbolize_keys.update(options)
           end
           uri = URI::Generic.build({scheme: "http", host: base_url_or_host, port: DEFAULT_HTTP_PORT}.update(options))
-          @base_http_url = uri.to_s
+          @base_url = uri.to_s
         end
-        @ssl_disabled = options.delete(:ssl_disabled)
-        @ssl_disabled ||= (uri.port == 3000)
-        @base_https_url = @ssl_disabled ? @base_http_url : build_https_url(uri, options[:https_port])
-        # @api_version = options[:api_version] || "1.0.0"
 
         @httpclient = HTTPClient.new
         @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
       end
 
-      def build_https_url(uri, port = nil)
-        uri.scheme = "https"
-        uri.port = port || (uri.port == PRODUCTION_HTTP_PORT ? PRODUCTION_HTTPS_PORT : uri.port + 1)
-        uri.to_s
-      end
-
       def login_form_url
-        @login_form_url ||= base_https_url + "/users/sign_in.html"
+        @login_form_url ||= base_url + "/users/sign_in.html"
       end
       def login_url
-        @login_url ||= base_https_url + "/api/sign_in.json"
+        @login_url ||= base_url + "/api/sign_in.json"
       end
 
       # magellan-apiサーバに接続してログインの検証と処理を行います。
@@ -75,7 +62,7 @@ module Magellan
       def login_and_status
         @auth_token ||= get_auth_token
         params = {
-          "user" => {"email" => "magellan@groovenauts.jp", "password" => "password"},
+          "user" => load_selection("login"),
           "authenticity_token" => @auth_token
         }.to_json
         res2 = Ssl.retry_on_ssl_error("login"){ @httpclient.post(login_url, params, JSON_HEADER) }

data/lib/magellan/cli/resources.rb

@@ -10,11 +10,13 @@ module Magellan
     module Resources
 
       autoload :Base             , "magellan/cli/resources/base"
+      autoload :Organization     , "magellan/cli/resources/organization"
+      autoload :Team             , "magellan/cli/resources/team"
       autoload :Project          , "magellan/cli/resources/project"
       autoload :Stage            , "magellan/cli/resources/stage"
       autoload :ClientVersion    , "magellan/cli/resources/client_version"
 
-      autoload :FunctionUnit     , "magellan/cli/resources/function_unit"
+      autoload :TransactionRouter, "magellan/cli/resources/transaction_router"
       autoload :WorkerVersion     , "magellan/cli/resources/worker_version"
 
       autoload :HostInstance     , "magellan/cli/resources/host_instance"

data/lib/magellan/cli/resources/base.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require "magellan/cli/resources"
+require "magellan/cli/file_access"
 
 require 'json'
 require 'yaml'
@@ -11,36 +12,14 @@ module Magellan
   module Cli
     module Resources
 
-      class NotSelected < StandardError
-      end
-
       class NotFound < StandardError
       end
 
       class Base < ::Magellan::Cli::Http
+        include Magellan::Cli::FileAccess
 
         no_commands do
 
-          def load_selections
-            File.readable?(".magellan-cli") ? YAML.load_file(".magellan-cli") : {}
-          end
-
-          def load_selection(name)
-            sel = load_selections
-            s = sel[name]
-            raise NotSelected, "No #{name} selected" unless s
-            return s
-          end
-
-          def update_selections(hash = nil)
-            sel = load_selections
-            sel.update(hash) if hash
-            yield(sel) if block_given?
-            open(".magellan-cli", "w") do |f|
-              YAML.dump(sel, f)
-            end
-          end
-
           def build_query(hash)
             @@no ||= 0
             r = {}
@@ -88,7 +67,7 @@ module Magellan
 
           def select(name)
             q = build_query("name" => name).update(default_query)
-            update_first_result(self.class.resource_name, "/admin/#{self.class.resource_name}.json", q)
+            update_first_result(self.class.parameter_name, "/admin/#{self.class.resource_name}.json", q)
           end
 
           def deselect
@@ -104,6 +83,12 @@ module Magellan
               no_commands do
                 cattr_accessor :resource_name
                 cattr_accessor :resource_dependency
+                def self.parameter_name
+                  resource_name.gsub(/~/, "_")
+                end
+                def parameter_name
+                  self.class.parameter_name
+                end
               end
 
               desc "list", "list #{base_name}"

data/lib/magellan/cli/resources/client_version.rb

@@ -8,6 +8,18 @@ module Magellan
       class ClientVersion < Base
         self.resource_name = "client_version"
         self.resource_dependency = {"stage" => "stage"}
+
+        desc "create VERSION", "create New Client Version"
+        def create(version)
+          stage = load_selection("stage")
+          params = {
+            parameter_name => {
+              "stage_title_id" => stage["id"],
+              "version" => version,
+            }
+          }
+          post_json("/admin/#{resource_name}/new.js", params)
+        end
       end
 
     end

data/lib/magellan/cli/resources/container_image.rb

@@ -6,6 +6,8 @@ module Magellan
     module Resources
 
       class ContainerImage < Base
+        self.resource_name = "container~image"
+        self.resource_dependency = {"stage" => "stage-version"}
       end
 
     end

data/lib/magellan/cli/resources/container_instance.rb

@@ -6,18 +6,8 @@ module Magellan
     module Resources
 
       class ContainerInstance < Base
-        self.resource_name = "container_instance"
-        self.resource_dependency = {"host" => "host_instance"}
-
-        desc "start ID", "start container instance specified by ID"
-        def start(id)
-          post_json("/admin/container_instance/#{id}/status_control.json", {})
-        end
-
-        desc "stop ID", "stop container instance specified by ID"
-        def stop(id)
-          delete("/admin/container_instance/#{id}/status_control.json")
-        end
+        self.resource_name = "container~instance"
+        self.resource_dependency = {"stage" => "stage-version"}
       end
 
     end

data/lib/magellan/cli/resources/host_instance.rb

@@ -6,12 +6,19 @@ module Magellan
     module Resources
 
       class HostInstance < Base
-        self.resource_name = "host_instance"
-        self.resource_dependency = {"stage" => "stage-version"}
-
-        desc "sample_launch_options", "dump sample launch_options for create"
-        def sample_launch_options
-          $stdout.puts File.read(File.expand_path("../sample_launch_options.json", __FILE__))
+        self.resource_name = "vm~instance"
+        self.resource_dependency = {"stage" => "stage"}
+
+        desc "list", "list instances"
+        def list
+          stage_id = load_selection("stage")["id"] rescue nil
+          r = ""
+          if stage_id
+            r = get_json("/admin/stage~title/#{stage_id}/instance_list.json", {})
+          else
+            r = get_json("/admin/vm~instance.json")
+          end
+          $stdout.puts(JSON.pretty_generate(r) << "\nTotal: #{r.length}")
         end
 
         desc "create NAME [LAUNCH_OPTIONS]", "create Host Instance"
@@ -26,29 +33,9 @@ module Magellan
               "launch_options_yaml" => YAML.dump(launch_options),
             }
           }
-          post_json("/admin/host_instance/new.js", params)
-        end
-
-        desc "launch", "launch host instance"
-        def launch
-          id = load_selection(self.class.resource_name)["id"]
-          post_json("/admin/host_instance/#{id}/status_control.json", {})
-        end
-
-        desc "prepare", "prepare host instance"
-        def prepare
-          id = load_selection(self.class.resource_name)["id"]
-          put_json("/admin/host_instance/#{id}/status_control.json", {})
+          post_json("/admin/vm~instance/new.js", params)
         end
 
-        desc "stop", "stop host instance"
-        def stop
-          id = load_selection(self.class.resource_name)["id"]
-          delete("/admin/host_instance/#{id}/status_control.json")
-        end
-
-
-
       end
 
     end

data/lib/magellan/cli/resources/organization.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require "magellan/cli/resources"
+
+module Magellan
+  module Cli
+    module Resources
+
+      class Organization < Base
+        self.resource_name = "magellan~auth~organization"
+
+        desc "create NAME", "create Organization with NAME"
+        def create(name)
+          params = {
+            parameter_name => {
+              "name" => name,
+            }
+          }
+          post_json("/admin/#{self.resource_name}/new.js", params)
+        end
+      end
+
+    end
+  end
+end

data/lib/magellan/cli/resources/project.rb

@@ -13,7 +13,19 @@ module Magellan
         def update(attrs)
           s = load_selection("project")
           attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
-          put_json("/admin/magellan~auth~project/#{s['id']}/edit", {"magellan_auth_project" => attrs})
+          put_json("/admin/project/#{s['id']}/edit", {"project" => attrs})
+        end
+
+        desc "create NAME", "create new project with NAME"
+        def create(name)
+          o = load_selection(Organization.parameter_name)
+          params = {
+            parameter_name => {
+              "organization_id" => o["id"],
+              "name" => name,
+            }
+          }
+          post_json("/admin/#{resource_name}/new.js", params)
         end
       end
 

data/lib/magellan/cli/resources/stage.rb

@@ -10,6 +10,24 @@ module Magellan
         self.resource_name = "stage~title"
         self.resource_dependency = {"project" => "project"}
 
+        desc "create NAME [-t development|staging|production|other]", "create Stage with Name and Type"
+        option :t, type: :string, default: "development", desc: "-t development|staging|production. specify Stage Type"
+        def create(name)
+          type = options["t"]
+          unless %w{ development staging production other }.include?(type)
+            raise "Unknown Stage Type #{type}"
+          end
+          proj = load_selection("project")
+          params = {
+            parameter_name => {
+              "project_id" => proj["id"],
+              "name" => name,
+              "stage_type" => type,
+            }
+          }
+          post_json("/admin/#{resource_name}/new.js", params)
+        end
+
         desc "select NAME", "select Stage named by NAME"
         def select(name)
           q = build_query("name" => name).update(default_query)
@@ -62,6 +80,18 @@ module Magellan
           id = s["id"]
           post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "release_now"})
         end
+
+        desc "logs", "fetch worker logs"
+        def logs
+          s = load_selection("stage")
+          id = s["id"]
+          obj = get_json("/admin/stage~title/#{id}/logs.json")
+          if obj["value"]
+            obj["value"].each do |log|
+              puts "#{Time.at(log["time"]).strftime("%Y-%m-%d %H:%M:%S")}:#{log["version"]}:#{log["container"]}: #{log["message"]}"
+            end
+          end
+        end
       end
 
     end

data/lib/magellan/cli/resources/team.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require "magellan/cli/resources"
+
+module Magellan
+  module Cli
+    module Resources
+
+      class Team < Base
+        self.resource_name = "magellan~auth~team"
+        self.resource_dependency = { "organization" =>  Organization.parameter_name }
+
+        desc "create NAME ROLE", "create Team with NAME ROLE"
+        def create(name, role)
+          unless %w{ readers admin }.include?(role)
+            raise "ROLE should be 'readers' or 'admin'"
+          end
+          o = load_selection(Organization.parameter_name)
+          params = {
+            parameter_name => {
+              "organization_id" => o["id"],
+              "name" => name,
+              "role" => role,
+            }
+          }
+          post_json("/admin/#{self.resource_name}/new.js", params)
+        end
+
+=begin
+        desc "invite EMAIL", "invite a user to the Team"
+        def invite(email)
+          o = load_selection(parameter_name)
+          params = {
+            "email" => email
+          }
+          post_json("/admin/#{self.resource_name}/#{o["id"]}/team_invite.json", params)
+        end
+=end
+      end
+
+    end
+  end
+end

data/lib/magellan/cli/resources/transaction_router.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require "magellan/cli/resources"
+
+module Magellan
+  module Cli
+    module Resources
+
+      class TransactionRouter < Base
+        self.resource_name = "functions~transaction_router"
+        self.resource_dependency = {"stage" => Stage.parameter_name}
+
+        desc "create NAME", "create TransactionRouter with NAME"
+        def create(name)
+          s = load_selection("stage-version")
+          params = {
+            self.class.parameter_name => {
+              "stage_version_id" => s["id"],
+              "name" => name,
+              # "instance_base_name" => name,
+            }
+          }
+          post_json("/admin/#{self.resource_name}/new.js", params)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/magellan/cli/resources/worker_version.rb

@@ -6,7 +6,7 @@ module Magellan
     module Resources
 
       class WorkerVersion < Base
-        self.resource_name = "worker_version"
+        self.resource_name = "functions~worker"
         self.resource_dependency = {"stage" => "stage-version"}
 
         desc "create NAME, IMAGE", "create WorkerVersion with NAME, IMAGE"
@@ -20,18 +20,14 @@ module Magellan
               {}
             end
           params = {
-            "worker_version" => {
+            "functions_worker" => {
               "stage_version_id" => s["id"],
+              "name" => name,
               "image_name" => image_name,
               # "instance_base_name" => name,
-              "function_unit_attributes" => { # accepts_nested_attributes_for
-                "name" => name,
-                "kind" => "201",
-                "stage_version_id" => s["id"],
-              }
             }.update(attrs)
           }
-          post_json("/admin/worker_version/new.js", params)
+          post_json("/admin/#{self.resource_name}/new.js", params)
         end
 
       end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/magellan/cli/login_spec.rb

@@ -4,13 +4,20 @@ require 'spec_helper'
 describe Magellan::Cli::Login do
 
   describe :login! do
+    let(:email){ "magellan@groovenauts.jp" }
+    let(:password){ "password" }
     let(:auth_token){ "047bcCC1dnyVE+7DWE6YKIJF97L/qHk1mPrf2oaqWtE=" }
 
+    before do
+      allow(File).to receive(:readable?).and_return(true)
+      allow(YAML).to receive(:load_file).with(".magellan-cli").and_return({"login" => {"email" => email, "password" => password} })
+    end
+
     context :production do
-      let(:cli){ Magellan::Cli::Login.new("http://example.com") }
+      let(:cli){ Magellan::Cli::Login.new("https://example.com") }
       before do
         res = double(:res)
-        allow(cli.httpclient).to receive(:get).with("https://example.com:443/users/sign_in.html").and_return(res)
+        allow(cli.httpclient).to receive(:get).with("https://example.com/users/sign_in.html").and_return(res)
         allow(res).to receive(:status).and_return(200)
         allow(res).to receive(:body).and_return(File.read(File.expand_path("../login_page.html", __FILE__)))
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
@@ -18,14 +25,14 @@ describe Magellan::Cli::Login do
 
       let(:params) do
         {
-          "user" => {"email" => "magellan@groovenauts.jp", "password" => "password"},
+          "user" => {"email" => email, "password" => password},
           "authenticity_token" => auth_token,
         }
       end
 
       it :login_success do
         res = double(:res)
-        allow(cli.httpclient).to receive(:post).with("https://example.com:443/api/sign_in.json", params.to_json, Magellan::Cli::JSON_HEADER).and_return(res)
+        allow(cli.httpclient).to receive(:post).with("https://example.com/api/sign_in.json", params.to_json, Magellan::Cli::JSON_HEADER).and_return(res)
         allow(res).to receive(:status).and_return(200)
         allow(res).to receive(:body).and_return({"success" => true}.to_json)
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
@@ -34,13 +41,40 @@ describe Magellan::Cli::Login do
 
       it :login_failure do
         res = double(:res)
-        allow(cli.httpclient).to receive(:post).with("https://example.com:443/api/sign_in.json", params.to_json, Magellan::Cli::JSON_HEADER).and_return(res)
+        allow(cli.httpclient).to receive(:post).with("https://example.com/api/sign_in.json", params.to_json, Magellan::Cli::JSON_HEADER).and_return(res)
         allow(res).to receive(:status).and_return(401) # Unauthorized
         allow(res).to receive(:body).and_return({"success" => false, "message" => "Error with your login or password"}.to_json)
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
         expect{cli.login!}.to raise_error(Magellan::Cli::LoginError, 'status: 401 {"success":false,"message":"Error with your login or password"}')
       end
     end
+
+    context :development do
+      let(:cli){ Magellan::Cli::Login.new("http://localhost:3001") }
+      before do
+        res = double(:res)
+        allow(cli.httpclient).to receive(:get).with("http://localhost:3001/users/sign_in.html").and_return(res)
+        allow(res).to receive(:status).and_return(200)
+        allow(res).to receive(:body).and_return(File.read(File.expand_path("../login_page.html", __FILE__)))
+        allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
+      end
+
+      let(:params) do
+        {
+          "user" => {"email" => email, "password" => password},
+          "authenticity_token" => auth_token,
+        }
+      end
+
+      it :login_success do
+        res = double(:res)
+        allow(cli.httpclient).to receive(:post).with("http://localhost:3001/api/sign_in.json", params.to_json, Magellan::Cli::JSON_HEADER).and_return(res)
+        allow(res).to receive(:status).and_return(200)
+        allow(res).to receive(:body).and_return({"success" => true}.to_json)
+        allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
+        expect(cli.login!).to eq cli # 自身を返す
+      end
+    end
   end
 
 end

data/spec/magellan/cli/resources/client_version_spec.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Magellan::Cli::Resources::ClientVersion do
+
+  let(:cmd){ Magellan::Cli::Resources::ClientVersion.new }
+
+  describe :list do
+    before do
+      expect(cmd).to receive(:load_selections).and_return({"stage" => {"id" => "1", "name" => "StageA"} })
+      expect(cmd).to receive(:get_json).and_return([{id: 1, project_id: 1, stage_title_id: 1, version: "1.0.0", url_mapping_yaml: nil, status: "1" }])
+      expect($stdout).to receive(:puts)
+    end
+    it do
+      cmd.list
+    end
+  end
+
+  describe :create do
+    describe :success do
+      before do
+        expect(cmd).to receive(:load_selections).and_return({"stage" => {"id" => 1, "name" => "StageA"}})
+        expect(cmd).to receive(:post_json).with("/admin/client_version/new.js", { "client_version" => { "stage_title_id" => 1, "version" => "1.1.0" } })
+      end
+      it do
+        cmd.create("1.1.0")
+      end
+    end
+    describe :error do
+      context "stage not selected" do
+        before do
+          expect(cmd).to receive(:load_selections).and_return({})
+        end
+        it do
+          expect{
+            cmd.create("1.1.0")
+          }.to raise_error(Magellan::Cli::FileAccess::NotSelected)
+        end
+      end
+    end
+  end
+
+end

data/spec/magellan/cli/resources/organization_spec.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Magellan::Cli::Resources::Organization do
+
+  let(:cmd){ Magellan::Cli::Resources::Organization.new }
+
+  describe :list do
+    before do
+      expect(cmd).to receive(:get_json).and_return([{id: 1, name: "org1", creator_id: 1}])
+      expect($stdout).to receive(:puts)
+    end
+    it do
+      cmd.list
+    end
+  end
+
+  describe :create do
+    before do
+      expect(cmd).to receive(:post_json).with("/admin/magellan~auth~organization/new.js", {"magellan_auth_organization" => { "name" => "new1" }})
+    end
+    it do
+      cmd.create("new1")
+    end
+  end
+
+end

data/spec/magellan/cli/resources/project_spec.rb

@@ -6,7 +6,7 @@ describe Magellan::Cli::Resources::Project do
   let(:base_url){ "https://localhost:3000" }
   let(:httpclient){ double(:httpclient) }
   let(:cli) do
-    cli = double(:login, base_https_url: base_url)
+    cli = double(:login, base_url: base_url)
     allow(cli).to receive(:httpclient).and_return(httpclient)
     cli
   end

data/spec/magellan/cli/resources/team_spec.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Magellan::Cli::Resources::Team do
+
+  let(:cmd){ Magellan::Cli::Resources::Team.new }
+
+  describe :list do
+    before do
+      expect(cmd).to receive(:load_selections).and_return({"magellan_auth_organization" => {"id" => "1", "name" => "testorg1"} })
+      expect(cmd).to receive(:get_json).and_return([{id: 1, organization_id: 1, name: "team1" }])
+      expect($stdout).to receive(:puts)
+    end
+    it do
+      cmd.list
+    end
+  end
+
+  describe :create do
+    describe :success do
+      before do
+        expect(cmd).to receive(:load_selection).with("magellan_auth_organization").and_return({"id" => 1, "name" => "org1"})
+        expect(cmd).to receive(:post_json).with("/admin/magellan~auth~team/new.js", { "magellan_auth_team" => { "organization_id" => 1, "name" => "team1", "role" => role } })
+      end
+      context "role=readers" do
+        let(:role){ "readers" }
+        it do
+          cmd.create("team1", role)
+        end
+      end
+      context "role=readers" do
+        let(:role){ "admin" }
+        it do
+          cmd.create("team1", role)
+        end
+      end
+    end
+    describe :error do
+      context "role=readers" do
+        let(:role){ "owners" }
+        it do
+          expect{
+            cmd.create("team1", role)
+          }.to raise_error(RuntimeError, /ROLE should be/)
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -131,6 +131,7 @@ files:
 - lib/magellan/cli/command.rb
 - lib/magellan/cli/direct.rb
 - lib/magellan/cli/errors.rb
+- lib/magellan/cli/file_access.rb
 - lib/magellan/cli/http.rb
 - lib/magellan/cli/login.rb
 - lib/magellan/cli/resources.rb
@@ -138,10 +139,12 @@ files:
 - lib/magellan/cli/resources/client_version.rb
 - lib/magellan/cli/resources/container_image.rb
 - lib/magellan/cli/resources/container_instance.rb
-- lib/magellan/cli/resources/function_unit.rb
 - lib/magellan/cli/resources/host_instance.rb
+- lib/magellan/cli/resources/organization.rb
 - lib/magellan/cli/resources/project.rb
 - lib/magellan/cli/resources/stage.rb
+- lib/magellan/cli/resources/team.rb
+- lib/magellan/cli/resources/transaction_router.rb
 - lib/magellan/cli/resources/worker_version.rb
 - lib/magellan/cli/sample_launch_options.json
 - lib/magellan/cli/ssl.rb
@@ -150,7 +153,10 @@ files:
 - spec/magellan/cli/Magellan.yml
 - spec/magellan/cli/login_page.html
 - spec/magellan/cli/login_spec.rb
+- spec/magellan/cli/resources/client_version_spec.rb
+- spec/magellan/cli/resources/organization_spec.rb
 - spec/magellan/cli/resources/project_spec.rb
+- spec/magellan/cli/resources/team_spec.rb
 - spec/magellan/cli_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -181,7 +187,9 @@ test_files:
 - spec/magellan/cli/Magellan.yml
 - spec/magellan/cli/login_page.html
 - spec/magellan/cli/login_spec.rb
+- spec/magellan/cli/resources/client_version_spec.rb
+- spec/magellan/cli/resources/organization_spec.rb
 - spec/magellan/cli/resources/project_spec.rb
+- spec/magellan/cli/resources/team_spec.rb
 - spec/magellan/cli_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/magellan/cli/resources/function_unit.rb

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-require "magellan/cli/resources"
-
-module Magellan
-  module Cli
-    module Resources
-
-      class FunctionUnit < Base
-        self.resource_name = "function_unit"
-        self.resource_dependency = {"stage" => "stage-version"}
-
-        desc "create [ATTRIBUTES]", "create FunctionUnit with ATTRIBUTES (filepath or JSON text)"
-        def create(attrs = nil)
-          stage_id = load_selection("stage-version")
-          attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
-          params = {
-            "function_unit" => {
-              "stage_version_id" => stage_id,
-            }.update(attrs)
-          }
-          post_json("/admin/function_unit/new.js", params)
-        end
-      end
-
-    end
-  end
-end