magellan-cli 0.2.19 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727be865a8fa69b098afe51d712bad1a31a45724
-  data.tar.gz: 506f81d124f8eb15b767f11f69feaf19d1684257
+  metadata.gz: 1f56a7867635b8b04efd6c8963f2e361d5595b4c
+  data.tar.gz: bdcd4c0d35743f63d06893c86f19ae444cfc23c2
 SHA512:
-  metadata.gz: dbecdde19ac927dcc2259a967a944e697aca441a12ec3f518d25a9a31d133663ed90e8a94daf719407f059d7933a1baa07248e8e0fe961640a8feb71eae47ab4
-  data.tar.gz: 935c8e96e86ec2cf3caf5742b40495bf941ebc3761c2464b72e93517d2709dc2a3fa4675bf27b8e02ef0d31bd34a1dce9e6362f9337c657d55400f7dbe72257c
+  metadata.gz: 13e9af5a5addcd0a6b6e1f9112de1547c03ca2a6593ad49e417a6707309b2162552c0ed8fad4e1d0791095b27d091f476615fa9d5b52f82375c69b290158c2d1
+  data.tar.gz: f8e9cadeafb898f308e78cb5f8e5bfe1f6385474c3b2f23e87f491c31e1979285ad880da76a7d28592e2a108813f22d9f1765a0964c0730f3ce34132b05ac7bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.2.19)
+    magellan-cli (0.3.0)
       activesupport (~> 4.1.4)
       groovenauts-thor
       httpclient (~> 2.5)

data/lib/magellan/cli/base.rb

@@ -29,22 +29,22 @@ module Magellan
           opts[:verbose]
         end
 
-        def verbose(msg)
-          self.class.verbose(msg) if verbose?
+        def log_verbose(msg)
+          self.class.log_verbose(msg) if verbose?
         end
 
-        def info(msg)
-          self.class.info(msg)
+        def log_info(msg)
+          self.class.log_info(msg)
         end
-        def success(msg)
-          self.class.success(msg)
+        def log_success(msg)
+          self.class.log_success(msg)
         end
-        def error(msg)
-          self.class.error(msg)
+        def log_error(msg)
+          self.class.log_error(msg)
         end
 
         def fatal(msg)
-          verbose(caller.join("\n  "))
+          log_verbose(caller.join("\n  "))
           raise Cli::Error, msg
         end
       end
@@ -54,16 +54,16 @@ module Magellan
           $stderr.puts("\e[#{color_no}m#{msg}\e[0m")
         end
 
-        def verbose(msg, flag = true)
+        def log_verbose(msg, flag = true)
           puts_with_color(34, msg) if flag
         end
-        def info(msg)
+        def log_info(msg)
           puts_with_color(0, msg)
         end
-        def success(msg)
+        def log_success(msg)
           puts_with_color(32, msg)
         end
-        def error(msg)
+        def log_error(msg)
           puts_with_color(31, msg)
         end
 

data/lib/magellan/cli/command.rb

@@ -6,22 +6,26 @@ require 'active_support/core_ext/string/inflections'
 module Magellan
   module Cli
     class Command < Base
+      include Magellan::Cli::FileAccess
 
       class << self
         # override Thor::Base.start method
         def start(given_args = ARGV, config = {})
           # class_options verbose and version are defined in Magellan::Cli::Base
-          if ARGV.include?("-v") || ARGV.include?("--version")
-            info(File.basename($0) << " " << Magellan::Cli::VERSION)
+          if (ARGV == ["-v"] || ARGV == ["--version"])
+            log_info(File.basename($0) << " " << Magellan::Cli::VERSION)
+            exit(0)
+          elsif ARGV.include?("-v") || ARGV.include?("--version")
+            log_info(File.basename($0) << " " << Magellan::Cli::VERSION)
           end
           begin
             super(given_args, config)
           rescue Magellan::Cli::Error => e
-            error(e.message)
+            log_error(e.message)
             exit(1)
           rescue => e
-            error("[#{e.class}] #{e.message}")
-            verbose("  " << e.backtrace.join("\n  "), ARGV.include?("-V") || ARGV.include?("--verbose"))
+            log_error("[#{e.class}] #{e.message}")
+            log_verbose("  " << e.backtrace.join("\n  "), ARGV.include?("-V") || ARGV.include?("--verbose"))
             exit(1)
           end
         end
@@ -66,6 +70,21 @@ module Magellan
         Magellan::Cli::Http.new.login!(email, password)
       end
 
+      desc "info", "Show login user and selected resources"
+      def info
+        cli = Magellan::Cli::Login.new
+        cli.check_login_auth!
+        selections = load_selections || {}
+        d = {"user" => cli.login_auth["email"] }
+        Resources::MAPPING.each do |classname, name|
+          klass = ::Magellan::Cli::Resources.const_get(classname)
+          if val = selections[ klass.parameter_name ]
+            d[name] = val["name"] ? val["name"] : val.inspect
+          end
+        end
+        log_info YAML.dump(d)
+      end
+
     end
   end
 end

data/lib/magellan/cli/file_access.rb

@@ -19,10 +19,17 @@ module Magellan
         File.readable?(SELECTION_FILENAME) ? YAML.load_file(SELECTION_FILENAME) : {}
       end
 
-      def load_selection(name)
+      # @param [Class|String] obj Resource class or resource name
+      def load_selection(obj)
+        if obj.respond_to?(:parameter_name)
+          name = obj.parameter_name
+          label = obj.name.split(/::/).last.underscore
+        else
+          name = label = obj
+        end
         sel = load_selections
         s = sel[name]
-        raise NotSelected, "No #{name} selected" unless s
+        raise NotSelected, "No #{label} selected" unless s
         return s
       end
 

data/lib/magellan/cli/http.rb

@@ -14,21 +14,18 @@ module Magellan
         def login!(email, password)
           logined = cli.api_login!(email, password)
           if logined
-            success("OK")
+            log_success("OK")
           else
-            error("Login Failure.")
+            log_error("Login Failure.")
           end
         end
 
         def access_api
           if block_given?
-            auth = cli.login_auth
-            if auth.nil? || auth.empty?
-              raise Magellan::Cli::Error, "Not logined yet. type `#{File.basename($0)} login`."
-            end
+            cli.check_login_auth!
             return yield(cli)
           else
-            return success("OK")
+            return log_success("OK")
           end
         end
 
@@ -36,7 +33,7 @@ module Magellan
           case res.status
           when 200...300 then
             r = JSON.parse(res.body)
-            verbose(JSON.pretty_generate(r))
+            log_verbose(JSON.pretty_generate(r))
             r
           else
             obj = JSON.parse(res.body) rescue nil
@@ -45,7 +42,7 @@ module Magellan
             else
               msg = "HTTP Error: status=#{res.status}"
               msg << "\n#{res.body}" if verbose?
-              error(msg)
+              log_error(msg)
             end
           end
         end
@@ -62,7 +59,7 @@ module Magellan
             if params && !params.empty?
               url << '?' << params.map{|k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
             end
-            verbose("GET #{url}")
+            log_verbose("GET #{url}")
             # "Unknown key: max-age = 0" というメッセージを表示させないために$stderrを一時的に上書き
             $stderr, bak = StringIO.new, $stderr
             res = nil
@@ -125,13 +122,13 @@ module Magellan
         def delete(rel_path)
           access_api do |api|
             params = api.login_auth
-            process_res(api, :delete, rel_path, params)
+            process_res(api, :delete, rel_path, params.to_json, JSON_HEADER)
           end
         end
 
         def process_res(api, http_method, rel_path, *args)
           url = "#{api.base_url}#{rel_path}"
-          verbose("%s %s\n%s" % [http_method.to_s.upcase, url, args])
+          log_verbose("%s %s\n%s" % [http_method.to_s.upcase, url, args])
           res = api.httpclient.send(http_method, url, *args)
           check_response(res)
         end

data/lib/magellan/cli/login.rb

@@ -56,6 +56,13 @@ module Magellan
         @login_url ||= base_url + "/api/sign_in.json"
       end
 
+      def check_login_auth!
+        auth = login_auth
+        if auth.nil? || auth.empty?
+          raise Magellan::Cli::Error, "Not logined yet. type `#{File.basename($0)} login`."
+        end
+      end
+
       # magellan-apiサーバに接続してログインの検証とアクセストークンの保存を行います。
       #
       # @return [boolean] login成功/失敗

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

@@ -53,12 +53,16 @@ module Magellan
             end
           end
 
+          def get_first_result!(name, path, query)
+            results = get_json(path, query)
+            raise NotFound, "#{name} not found for #{query.inspect}" if results.blank? || results.first.blank?
+            results.first
+          end
+
           DEFAULT_SELECTION_FIELDS = %w[id name].freeze
 
           def update_first_result(name, path, query, fields = DEFAULT_SELECTION_FIELDS)
-            results = get_json(path, query)
-            raise NotFound, "#{name} not found for #{query.inspect}" if results.blank? || results.first.blank?
-            r = results.first
+            r = get_first_result!(name, path, query)
             obj = fields.each_with_object({}) do |f, d|
               d[f] = r[f]
             end
@@ -108,14 +112,17 @@ module Magellan
               (self.class.multiline_fields || [])
 
             fields = original_fields.dup
+            fields.unshift(" ")
             associations = association_map(fields)
 
             t.head = fields
             t.rows = []
+            selected_id = (load_selections[ parameter_name ] || {})["id"]
             res1.each do |r|
               row = original_fields.map do |f|
                 association_get(associations, r, f)
               end
+              row.unshift(r["id"] == selected_id ? "*" : " ")
               t.rows << row
             end
             # $stdout.puts(JSON.pretty_generate(res1) << "\nTotal: #{res1.length}")
@@ -166,6 +173,16 @@ module Magellan
             update_selections! do |s|
               s.delete(self.class.parameter_name)
             end
+            deselect_dependants
+          end
+
+          def deselect_dependants
+            update_selections! do |s|
+              classes = Resources.dependants_on(self.class)
+              classes.each do |klass|
+                s.delete(klass.parameter_name)
+              end
+            end
           end
 
           def self.inherited(klass)

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

@@ -16,7 +16,7 @@ module Magellan
 
         desc "create VERSION", "Create a new #{resource_name}"
         def create(version)
-          stage = load_selection!("stage")
+          stage = load_selection!(Stage)
           params = {
             parameter_name => {
               "stage_title_id" => stage["id"],
@@ -27,6 +27,15 @@ module Magellan
           # TODO implement select method
           # select(version)
         end
+
+        desc "delete VERSION", "Delete the #{resource_name} specified by VERSION"
+        def delete(version)
+          q = build_query("version" => version).update(default_query)
+          r = get_first_result!(self.class.resource_name, "/admin/#{resource_key}.json", q)
+          super("/admin/#{resource_key}/#{r['id']}/delete")
+          log_success("OK")
+        end
+
       end
 
     end

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

@@ -7,12 +7,12 @@ module Magellan
 
       class Cloudsql < Base
         self.resource_key = "cloudsql~database"
-        self.resource_dependency = {"stage" => "stage"}
+        self.resource_dependency = {"stage" => Stage.parameter_name}
         self.hidden_fields = %w[cloudsql_instance_id].map(&:freeze).freeze
 
         desc "create NAME", "Create a new #{resource_name} database with NAME"
         def create(name)
-          o = load_selection!("stage")
+          o = load_selection!(Stage)
           params = {
             parameter_name => {
               "stage_title_id" => o["id"],

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

@@ -7,7 +7,7 @@ module Magellan
 
       class Container < Base
         self.resource_key = "container~instance"
-        self.resource_dependency = {"stage" => "stage-version"}
+        self.resource_dependency = {"stage" => Stage::VERSION_PARAMETER_NAME}
         self.hidden_fields = %w[created_at updated_at].map(&:freeze).freeze
         self.multiline_fields = %w[docker_properties_json links_yaml publishings_yaml volumes_yaml env_yaml].map(&:freeze).freeze
         self.field_associations = {

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

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require "magellan/cli/resources"
+
+module Magellan
+  module Cli
+    module Resources
+
+      module Deletable
+
+        def self.included(klass)
+          klass.module_eval do
+
+            desc "delete NAME", "Delete the #{resource_name} named by NAME"
+            def delete(name)
+              q = build_query("name" => name).update(default_query)
+              r = get_first_result!(self.class.resource_name, "/admin/#{resource_key}.json", q)
+              super("/admin/#{resource_key}/#{r['id']}/delete")
+              log_success("OK")
+            end
+
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Magellan
 
       class Image < Base
         self.resource_key = "container~image"
-        self.resource_dependency = {"stage" => "stage-version"}
+        self.resource_dependency = {"stage" => Stage::VERSION_PARAMETER_NAME}
         self.hidden_fields = %w[function_id function_type created_at updated_at].map(&:freeze).freeze
         self.field_associations = {"stage_version_id" => {name: "stage", resource: "stage~version"} }
       end

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

@@ -6,6 +6,7 @@ module Magellan
     module Resources
 
       class Organization < Base
+        include Deletable
 
         self.resource_key = "magellan~auth~organization"
         # self.field_associations = {"creator_id" => {name: "creator", class: "User"} }

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

@@ -6,6 +6,8 @@ module Magellan
     module Resources
 
       class Project < Base
+        include Deletable
+
         self.resource_key = "project"
         self.resource_dependency = nil
         self.hidden_fields = %w[default_nebula_id created_at updated_at].map(&:freeze).freeze
@@ -13,14 +15,14 @@ module Magellan
 
         desc "update ATTRIBUTES", "Update the ATTRIBUTES of the selected #{resource_name}"
         def update(attrs)
-          s = load_selection!("project")
+          s = load_selection!(self.class)
           attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
           put_json("/admin/project/#{s['id']}/edit", {"project" => attrs})
         end
 
         desc "create NAME", "Create a new #{resource_name} with NAME"
         def create(name)
-          o = load_selection!(Organization.parameter_name)
+          o = load_selection!(Organization)
           params = {
             parameter_name => {
               "organization_id" => o["id"],

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

@@ -7,11 +7,16 @@ module Magellan
     module Resources
 
       class Stage < Base
+        include Deletable
+
         self.resource_key = "stage~title"
-        self.resource_dependency = {"project" => "project"}
+        self.resource_dependency = {"project" => Project.parameter_name}
         self.hidden_fields = %w[nebula_id created_at updated_at].map(&:freeze).freeze
         self.field_associations = {"project_id" => {name: "project", class: "Project"} }
 
+        VERSION_RESOURCE_KEY = "stage~version".freeze
+        VERSION_PARAMETER_NAME = "stage_version".freeze
+
         desc "create NAME [-t development|staging|production|other]", "Create a new #{resource_name} with Name and Type"
         option :t, type: :string, default: "development", desc: "-t development|staging|production. specify Stage Type"
         def create(name)
@@ -19,7 +24,7 @@ module Magellan
           unless %w{ development staging production other }.include?(type)
             raise "Unknown Stage Type #{type}"
           end
-          proj = load_selection!("project")
+          proj = load_selection!(Project)
           params = {
             parameter_name => {
               "project_id" => proj["id"],
@@ -33,24 +38,29 @@ module Magellan
 
         desc "select NAME", "Select the #{resource_name} named by NAME"
         def select(name)
+          if selected = load_selections[parameter_name]
+            deselect unless selected["name"] == name
+          end
+
           q = build_query("name" => name).update(default_query)
-          r = update_first_result("stage", "/admin/stage~title.json", q)
+          r = update_first_result(parameter_name, "/admin/stage~title.json", q)
 
           # # current
           # q = build_query("title" => r["id"], "phase" => 2) # 2: current
-          # update_first_result("stage-version", "/admin/stage~version.json", q, %w[id])
+          # update_first_result(VERSION_PARAMETER_NAME, "/admin/stage~version.json", q, %w[id])
 
           # # workspace
           q = build_query("title" => r["id"], "phase" => 1) # 1: workspace
-          update_first_result("stage-version", "/admin/stage~version.json", q, %w[id])
+          update_first_result(VERSION_PARAMETER_NAME, "/admin/stage~version.json", q, %w[id])
         end
 
         desc "deselect", "Deselect the #{resource_name}"
         def deselect
           update_selections! do |s|
-            s.delete("stage")
-            s.delete("stage-version")
+            s.delete(parameter_name)
+            s.delete(VERSION_PARAMETER_NAME)
           end
+          deselect_dependants
         end
 
         desc "planning", "Switch to planning to build next released version"
@@ -65,15 +75,15 @@ module Magellan
 
         no_commands do
           def switch_version(phase)
-            s = load_selection!("stage")
+            s = load_selection!(self.class)
             q = build_query("title" => s["id"], "phase" => phase) # 1: workspace, 2: current, 3: used
-            update_first_result("stage-version", "/admin/stage~version.json", q, %w[id])
+            update_first_result(VERSION_PARAMETER_NAME, "/admin/stage~version.json", q, %w[id])
           end
         end
 
         desc "prepare", "Prepare the #{Container.resource_name.pluralize}"
         def prepare
-          s = load_selection!("stage")
+          s = load_selection!(self.class)
           id = s["id"]
           r = post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "prepare_containers"})
           Container.new.show_list(r["result"])
@@ -87,7 +97,7 @@ module Magellan
 
         no_commands do
           def call_repair
-            s = load_selection!("stage")
+            s = load_selection!(self.class)
             id = s["id"]
             post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "repair"})
           end
@@ -95,7 +105,7 @@ module Magellan
 
         desc "update ATTRIBUTES", "Update ATTRIBUTES of the #{resource_name}"
         def update(attrs)
-          s = load_selection!("stage")
+          s = load_selection!(self.class)
           attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
           put_json("/admin/stage~title/#{s['id']}/edit", {"stage_title" => attrs})
         end
@@ -106,7 +116,7 @@ module Magellan
         option :t, type: :numeric, default: 600, desc: "-t timeout(seconds)"
         def release_now
           spacer = "\r" << (" " * 20)
-          stage = load_selection!("stage")
+          stage = load_selection!(self.class)
           print "\rrelease starting"
           id = stage["id"]
           res0 = post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "release_now"})
@@ -158,7 +168,7 @@ module Magellan
 
         desc "logs", "Fetch the logs of the #{Worker.resource_name.pluralize}"
         def logs
-          s = load_selection!("stage")
+          s = load_selection!(self.class)
           id = s["id"]
           obj = get_json("/admin/stage~title/#{id}/logs.json")
           if obj["value"]
@@ -170,15 +180,15 @@ module Magellan
 
         desc "set_container_num NUM", "Set the number of #{Container.resource_name.pluralize} for the selected #{Image.resource_name}"
         def set_container_num(num)
-          s = load_selection!("stage")
-          v = load_selection!("stage-version")
-          i = load_selection!("container_image")
+          s = load_selection!(self.class)
+          v = load_selection!(VERSION_PARAMETER_NAME)
+          i = load_selection!(Image)
           post_json("/admin/stage~version/#{v["id"]}/set_container_num.json", { container_num: num, container_image_id: i["id"] })
         end
 
         desc "reload", "Reload the last selections"
         def reload
-          s = load_selection!("stage")
+          s = load_selection!(self.class)
           select(s["name"])
           [Worker, Image, Container].each do |klass|
             s = (load_selections || {})[klass.parameter_name]

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

@@ -15,7 +15,7 @@ module Magellan
           unless %w{ reader admin }.include?(role)
             raise "ROLE should be 'reader' or 'admin'"
           end
-          o = load_selection!(Organization.parameter_name)
+          o = load_selection!(Organization)
           params = {
             parameter_name => {
               "organization_id" => o["id"],
@@ -30,7 +30,7 @@ module Magellan
 =begin
         desc "invite EMAIL", "Invite a user to the #{Team.resource_name}"
         def invite(email)
-          o = load_selection!(parameter_name)
+          o = load_selection!(self.class)
           params = {
             "email" => email
           }

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

@@ -11,7 +11,7 @@ module Magellan
 
         desc "create NAME", "Create a new #{resource_name} with NAME"
         def create(name)
-          s = load_selection!("stage-version")
+          s = load_selection!(Stage::VERSION_PARAMETER_NAME)
           params = {
             self.class.parameter_name => {
               "stage_version_id" => s["id"],

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

@@ -6,8 +6,10 @@ module Magellan
     module Resources
 
       class Worker < Base
+        include Deletable
+
         self.resource_key = "functions~worker"
-        self.resource_dependency = {"stage" => "stage-version"}
+        self.resource_dependency = {"stage" => Stage::VERSION_PARAMETER_NAME}
         self.hidden_fields = %w[created_at updated_at].map(&:freeze).freeze
         self.multiline_fields = %w[migration_command_1 migration_command_2 run_command environment_vars_yaml].map(&:freeze).freeze
         self.field_associations = {"stage_version_id" => {name: "stage", resource: "stage~version"} }
@@ -15,7 +17,7 @@ module Magellan
         desc "create NAME, IMAGE", "Create a new #{resource_name} with NAME and IMAGE"
         method_option :attributes_yaml, aliases: "-A", desc: "path to YAML file which defines attributes"
         def create(name, image_name)
-          s = load_selection!("stage-version")
+          s = load_selection!(Stage::VERSION_PARAMETER_NAME)
           attrs =
             if path = options[:attributes_yaml]
               YAML.load_file(path)
@@ -41,7 +43,7 @@ module Magellan
           else
             attrs = JSON.parse(attrs)
           end
-          w = load_selection!(parameter_name)
+          w = load_selection!(self.class)
           self.class.hidden_fields.each do |f| attrs.delete(f) end
           self.class.field_associations.keys.each do |f| attrs.delete(f) end
           params = {
@@ -52,7 +54,7 @@ module Magellan
 
         desc "prepare_images", "Prepare the #{Image.resource_name.pluralize} for the selected #{Worker.resource_name}"
         def prepare_images
-          s = load_selection!("functions_worker")
+          s = load_selection!(Worker)
           id = s["id"]
           r = post_json("/admin/functions~worker/#{id}/simple_method_call.json", {method_name: "prepare_images"})
           Image.new.show_list(r["result"])

data/lib/magellan/cli/resources.rb

@@ -24,6 +24,8 @@ module Magellan
 
       autoload :Cloudsql, "magellan/cli/resources/cloudsql"
 
+      autoload :Deletable, "magellan/cli/resources/deletable"
+
 
       MAPPING =\
       {
@@ -39,6 +41,18 @@ module Magellan
         "Cloudsql"      => "cloudsql",
       }
 
+      class << self
+        def concrete_classes
+          @concrete_classes ||= MAPPING.keys.map{|c| self.const_get(c) }
+        end
+
+        def dependants_on(klass)
+          name = klass.name.split(/::/).last
+          res_name = MAPPING[name] or raise "unknown class named #{klass.name}"
+          concrete_classes.select{|c| c.resource_dependency && !!c.resource_dependency[res_name] }
+        end
+      end
+
     end
   end
 end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.2.19"
+    VERSION = "0.3.0"
   end
 end

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

@@ -5,7 +5,7 @@ describe Magellan::Cli::Resources::ClientVersion do
 
   let(:cmd){ Magellan::Cli::Resources::ClientVersion.new }
 
-  let(:cli){ double(:cli, login_auth: {"email" => "magellan@example.com", "toekn" => "dummy"}) }
+  let(:cli){ double(:cli, :check_login_auth! => nil) }
   before{ allow(cmd).to receive(:cli).and_return(cli) }
 
   describe :list do
@@ -22,7 +22,7 @@ describe Magellan::Cli::Resources::ClientVersion do
     describe :success do
       let(:client_version_list_response) { [ { "id" => 1, "version" => "1.1.0" } ] }
       before do
-        allow(cmd).to receive(:load_selections).and_return({"project" => {"id" => 1, "name" => "ProjectA"}, "stage" => {"id" => 1, "name" => "StageA"} })
+        allow(cmd).to receive(:load_selections).and_return({Magellan::Cli::Resources::Project.parameter_name => {"id" => 1, "name" => "ProjectA"}, Magellan::Cli::Resources::Stage.parameter_name => {"id" => 1, "name" => "StageA"} })
         expect(cmd).to receive(:post_json).with("/admin/client_version/new.json", { "client_version" => { "stage_title_id" => 1, "version" => "1.1.0" } })
         # TODO: stub in details
         # expect(cmd).to receive(:get_json).with(any_args).and_return(client_version_list_response)

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

@@ -5,7 +5,7 @@ describe Magellan::Cli::Resources::Organization do
 
   let(:cmd){ Magellan::Cli::Resources::Organization.new }
 
-  let(:cli){ double(:cli, login_auth: {"email" => "magellan@example.com", "toekn" => "dummy"}) }
+  let(:cli){ double(:cli, :check_login_auth! => nil) }
   before{ allow(cmd).to receive(:cli).and_return(cli) }
 
   describe :list do

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

@@ -5,7 +5,7 @@ describe Magellan::Cli::Resources::Team do
 
   let(:cmd){ Magellan::Cli::Resources::Team.new }
 
-  let(:cli){ double(:cli, login_auth: {"email" => "magellan@example.com", "toekn" => "dummy"}) }
+  let(:cli){ double(:cli, :check_login_auth! => nil) }
   before{ allow(cmd).to receive(:cli).and_return(cli) }
 
   describe :list do
@@ -22,7 +22,7 @@ describe Magellan::Cli::Resources::Team do
     describe :success do
       let(:team_list_response) { [{"id" => 1, "name" => "team1"}] }
       before do
-        allow(cmd).to receive(:load_selections).and_return({"magellan_auth_organization" => {"id" => 1, "name" => "org1"}})
+        allow(cmd).to receive(:load_selections).and_return({ Magellan::Cli::Resources::Organization.parameter_name => {"id" => 1, "name" => "org1"}})
         expect(cmd).to receive(:post_json).with("/admin/magellan~auth~team/new.json", { "magellan_auth_team" => { "organization_id" => 1, "name" => "team1", "role" => role } })
         # TODO: stub in details...
         allow(cmd).to receive(:get_json).with(any_args).and_return(team_list_response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.3.0
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -154,6 +154,7 @@ files:
 - lib/magellan/cli/resources/client_version.rb
 - lib/magellan/cli/resources/cloudsql.rb
 - lib/magellan/cli/resources/container.rb
+- lib/magellan/cli/resources/deletable.rb
 - lib/magellan/cli/resources/image.rb
 - lib/magellan/cli/resources/organization.rb
 - lib/magellan/cli/resources/project.rb