magellan-cli 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d6704f43cf56d986b9ff84182bc449ff4cab94b
-  data.tar.gz: 7288afebe3ad3db21870424d976e52d9467a4bfc
+  metadata.gz: dbc08ed4c015f59402a778c3ac90c9c29f8a3ec7
+  data.tar.gz: 00fd6124ff5fd4e6dfcb9dfcc95391c52ea95ee6
 SHA512:
-  metadata.gz: 1c84ff3dce8dd50cd767f14ba1cb8bcb503acd0fe81cebbec878a1e0e7fbc51ab5cddb0007915a9248478694bec73997bca4d3337094797ea55329e9f292ca8d
-  data.tar.gz: 954f8c14b5bbf532fab82cc1f02aa1ef89396eaa88d89b25b89c07a759f82d6adbcbfbea667f61fe70d8f182faf51e37d9dd166a5a621075e2d15a9e5f8025a4
+  metadata.gz: c5984f8fe6013b4c44e62bbf7276d79d1cf2ea6ea03e5c1abf58ca11648f6fa3b84d502a31c19412143f498bca3db99f9c3d3ce5455ddaec9bdc8ed3de3a1668
+  data.tar.gz: 038c1d6783ca431ab4baaf979ad60019a26c24b7cce283246b9b4f62b1f45b0c96e6c41293d0258848e99f0ae7158149499057486eed04341bb3f4ec7ce6ad9c

data/Gemfile.lock

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

data/lib/magellan/cli/locales/en.yml

@@ -84,6 +84,11 @@ en:
         show: "Show the detail of the %{res_name} specified by ID"
         select: "Select the %{res_name} by NAME"
         deselect: "Deselect the %{res_name}"
+    authority:
+      cmd:
+        select: "Select the %{resource_name} by ID"
+        delete: "Delete the %{resource_name} specified by ID"
+        create: "Create a new %{resource_name} with PROJECT_ROLE STAGE_ROLE STAGE_TYPE"
     client_version:
       cmd:
         select: "Select the %{resource_name} by VERSION"

data/lib/magellan/cli/locales/ja.yml

@@ -82,6 +82,11 @@ ja:
         show: "IDで指定された%{res_name}の詳細を表示します"
         select: "NAMEを指定して%{res_name}を選択します"
         deselect: "%{res_name}の選択を解除します"
+    authority:
+      cmd:
+        select: "ID を指定して%{resource_name}を選択します"
+        delete: "ID を指定して%{resource_name}を削除します"
+        create: "PROJECT_ROLE STAGE_ROLE STAGE_TYPE を指定して%{resource_name}を登録します"
     client_version:
       cmd:
         select: "VERSIONを指定して%{resource_name}を選択します"

data/lib/magellan/cli/resources.rb

@@ -15,6 +15,7 @@ module Magellan
       autoload :Project          , "magellan/cli/resources/project"
       autoload :Stage            , "magellan/cli/resources/stage"
       autoload :ClientVersion    , "magellan/cli/resources/client_version"
+      autoload :Authority        , "magellan/cli/resources/authority"
 
       autoload :TransactionRouter, "magellan/cli/resources/transaction_router"
       autoload :Worker           , "magellan/cli/resources/worker"
@@ -32,6 +33,7 @@ module Magellan
         "Organization"  => "organization",
         "Team"          => "team",
         "Project"       => "project",
+        "Authority"     => "authority",
         "Stage"         => "stage",
         "ClientVersion" => "client_version",
         #"TransactionRouter" => "tr",

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

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+require "magellan/cli/resources"
+
+module Magellan
+  module Cli
+    module Resources
+
+      class Authority < Base
+        self.resource_key = "magellan~auth~authority"
+        self.resource_dependency = { "team" =>  Team.parameter_name }
+        self.hidden_fields = %w[auth_type created_at updated_at].map(&:freeze).freeze
+        self.field_associations = {"team_id" => {name: "team", class: "Organization"},
+                                   "auth_id" => {name: "project", class: "Project"} }
+
+        desc "update ATTRIBUTES", I18n.t(:update, scope: [:resources, :common, :cmd], resource_name: resource_name)
+        def update(attrs)
+          s = load_selection!(self.class)
+          attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
+          put_json("/admin/#{resource_key}/#{s['id']}/edit", {"magellan_auth_authority" => attrs})
+        end
+
+        desc "create PROJECT_ROLE STAGE_ROLE STAGE_TYPE", I18n.t(:create, scope: [:resources, :authority, :cmd], resource_name: resource_name)
+        def create(project_role, stage_role, stage_type)
+          team = load_selection!(Team)
+          project = load_selection!(Project)
+          unless %w{ owner admin reader }.include?(project_role)
+            raise Magellan::Cli::Error, "PROJECT_ROLE must be owner/admin/reader"
+          end
+          unless %w{ read read_write }.include?(stage_role)
+            raise Magellan::Cli::Error, "STAGE_ROLE must be read/read_write"
+          end
+          unless %w{ development staging production }.include?(stage_type) or /\A\d\z/ =~ stage_type
+            raise Magellan::Cli::Error, "STAGE_TYPE must be development/staging/production or 0-9 (single digit)"
+          end
+          stage_type_map = {
+            "development" => 1,
+            "staging" => 2,
+            "production" => 3,
+          }
+          (1..9).each do |i| stage_type_map[i.to_s] = i end
+          params = {
+            parameter_name => {
+              "auth_id" => project["id"],
+              "auth_type" => "Project",
+              "team_id" => team["id"],
+              "project_role" => project_role,
+              "stage_role" => stage_role,
+              "stage_type" => stage_type_map[stage_type],
+            }
+          }
+          post_json("/admin/#{resource_key}/new.json", params)
+        end
+
+        desc "select ID", I18n.t(:select, scope: [:resources, :authority, :cmd], resource_name: resource_name)
+        def select(id)
+          q = build_query("id" => id)
+          update_first_result(self.class.parameter_name, id, "/admin/#{resource_key}.json", q)
+          update_selections! do |s|
+            self.class.deselect_dependants(s)
+          end
+        end
+
+        desc "delete ID", I18n.t(:delete, scope: [:resources, :authority, :cmd], resource_name: resource_name)
+        def delete(id)
+          q = build_query("id" => id).update(default_query)
+          r = get_first_result!(self.class.resource_name, id, "/admin/#{resource_key}.json", q)
+          super("/admin/#{resource_key}/#{r['id']}/delete")
+          log_success("OK")
+        end
+      end
+    end
+  end
+end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
   end
 end

data/spec/.magellan-cli.original

@@ -0,0 +1,7 @@
+---
+magellan_auth_organization:
+  id: 1
+  name: org1
+magellan_auth_team:
+  id: 1
+  name: team1

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

@@ -25,9 +25,9 @@ describe Magellan::Cli::Resources::Project do
       cmd.list
     end
 
-    let(:org_res_body){ [{"id":8,"name":"test1","email":"","creator_id":4,"created_at":"2015-02-18T14:27:16.000Z","updated_at":"2015-02-18T14:27:16.000Z","max_project_count":1,"max_team_count":100}] }
+    let(:org_res_body){ [{id:8,name:"test1",email:"",creator_id:4,created_at:"2015-02-18T14:27:16.000Z",updated_at:"2015-02-18T14:27:16.000Z",max_project_count:1,max_team_count:100}] }
     let(:org_res){ double(:org_res, status: 200, body: org_res_body.to_json) }
-    let(:list_res_body){ [{"id":9,"organization_id":8,"default_nebula_id":2,"name":"Project1","icon_url":nil,"consumer_key":"test1.Project1","consumer_secret":"a5etckpurpy0od3keo25iw77mtllo2fb","created_at":"2015-02-18T14:27:21.000Z","updated_at":"2015-02-18T14:27:21.000Z","max_stage_count":2}] }
+    let(:list_res_body){ [{id:9,organization_id:8,default_nebula_id:2,name:"Project1",icon_url:nil,consumer_key:"test1.Project1",consumer_secret:"a5etckpurpy0od3keo25iw77mtllo2fb",created_at:"2015-02-18T14:27:21.000Z",updated_at:"2015-02-18T14:27:21.000Z",max_stage_count:2}] }
     let(:list_res){ double(:res, status: 200, body: list_res_body.to_json) }
     it do
       buf = StringIO.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -205,6 +205,7 @@ files:
 - lib/magellan/cli/messaging/mqtt.rb
 - lib/magellan/cli/reference_generator.rb
 - lib/magellan/cli/resources.rb
+- lib/magellan/cli/resources/authority.rb
 - lib/magellan/cli/resources/base.rb
 - lib/magellan/cli/resources/client_version.rb
 - lib/magellan/cli/resources/cloudsql.rb
@@ -242,6 +243,7 @@ files:
 - reference/ja/stage.md
 - reference/ja/team.md
 - reference/ja/worker.md
+- spec/.magellan-cli.original
 - spec/magellan/cli/Magellan.yml
 - spec/magellan/cli/command_spec.rb
 - spec/magellan/cli/file_access_spec.rb
@@ -284,11 +286,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: commandline tools for magellanic cloud service.
 test_files:
+- spec/.magellan-cli.original
 - spec/magellan/cli/Magellan.yml
 - spec/magellan/cli/command_spec.rb
 - spec/magellan/cli/file_access_spec.rb