mystro-client 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,8 +1,24 @@
 # Changelog
 
-## v0.1.0.rc3:
+## v0.2.0:
+* fixes for new mystro version
+* orgs
+* initial release
+* update ruby version
+* ruby version file
 * add cssh support for linux users
 
 ## v0.1.0.rc2:
+* add cssh support for linux users
+
+## v0.1.0.rc3:
+* add cssh support for linux users
+* fix mystro-common dependency
+
+## v0.1.0.rc1:
+* initial release
+* update ruby version
+* ruby version file
+* add cssh support for linux users
 * fix mystro-common dependency
 

data/bin/mystro

@@ -9,17 +9,17 @@ require 'mystro/client'
 
 name = File.basename(__FILE__)
 
-def get_client(klass, account=nil)
+def get_client(klass, organization=nil)
   s = Mystro.config.server
-  a = account || Mystro.config.default_account
+  a = organization || Mystro.config.default_organization
   t = Mystro.config.token
-  #Mystro::Log.debug "server: '#{s}' account: '#{a}' token: '#{t}'"
+  #Mystro::Log.debug "server: '#{s}' organization: '#{a}' token: '#{t}'"
   Mystro::Client.new(klass, s, a, t)
 end
 
 module Mystro
   class Command < Clamp::Command
-    option %w{-x --account}, "ACCOUNT", "the account to filter with", default: nil, environment_variable: "MYSTRO_ACCOUNT"
+    option %w{-x --organization}, "ORGANIZATION", "the organization to filter with", default: nil, environment_variable: "MYSTRO_ORGANIZATION"
     option %w{-d --debug}, :flag, "turn on debugging", default: false do |v|
       Mystro::Log.console_debug
     end
@@ -32,7 +32,7 @@ module Mystro
       parameter "PATTERN ...", "name or pattern of server"
 
       def execute
-        client = get_client(:compute, account)
+        client = get_client(:compute, organization)
         list = client.search(pattern_list.join(","))
 
         raise "no servers matched" if list.count == 0
@@ -53,7 +53,7 @@ module Mystro
       parameter "PATTERN ...", "name or pattern of servers"
 
       def execute
-        client = get_client(:compute, account)
+        client = get_client(:compute, organization)
         list = client.search(pattern_list.join(","))
         puts "servers found: #{list.map{|e| e["name"]}.join(", ")}"
         cmd = "csshx --login #{user} #{list.map {|e| e["long"]||e["dns"]}.join(" ")}"
@@ -67,7 +67,7 @@ module Mystro
       parameter "PATTERN ...", "name or pattern of servers"
 
       def execute
-        client = get_client(:compute, account)
+        client = get_client(:compute, organization)
         list = client.search(pattern_list.join(","))
         puts "servers found: #{list.map{|e| e["name"]}.join(", ")}"
         cmd = "cssh --username #{user} #{"--options #{options}" if options} #{list.map {|e| e["long"]||e["dns"]}.join(" ")}"
@@ -81,9 +81,9 @@ module Mystro
       subcommand "list", "list computes" do
         option %w{-a --all}, :flag, "show private ip information", default: false
         def execute
-          client = get_client(:compute, account)
+          client = get_client(:compute, organization)
           list = client.list
-          keys = %w{Account Environment Name Roles IP DNS}
+          keys = %w{Organization Environment Name Roles IP DNS}
           if all?
             keys << 'private_ip'
             keys << 'private_dns'
@@ -95,9 +95,9 @@ module Mystro
         parameter "[PATTERN] ...", "show only matching this pattern"
         option %w{-a --all}, :flag, "show private ip information", default: false
         def execute
-          client = get_client(:compute, account)
+          client = get_client(:compute, organization)
           list = client.search(pattern_list.join(","))
-          keys = %w{Account Environment Name Roles IP DNS}
+          keys = %w{Organization Environment Name Roles IP DNS}
           if all?
             keys << 'private_ip'
             keys << 'private_dns'
@@ -111,19 +111,19 @@ module Mystro
       self.default_subcommand = "list"
       subcommand "list", "list balancers" do
         def execute
-          client = get_client(:balancer, account)
+          client = get_client(:balancer, organization)
           list = client.list
-          Mystro::Log.warn Mystro::CLI.list(%{Account Name}, list)
+          Mystro::Log.warn Mystro::CLI.list(%{Organization Name}, list)
         end
       end
     end
 
-    subcommand "account", "manage accounts" do
+    subcommand "organization", "manage organizations" do
       self.default_subcommand = "list"
-      subcommand "list", "list accounts" do
+      subcommand "list", "list organizations" do
         def execute
           ap Mystro.config.to_hash
-          client = get_client(:account, account)
+          client = get_client(:organization, organization)
           list = client.list
           Mystro::Log.warn Mystro::CLI.list(%w{Name Enabled File}, list)
         end
@@ -135,7 +135,7 @@ module Mystro
       subcommand "list", "list templates" do
         def execute
           ap Mystro.config.to_hash
-          client = get_client(:template, account)
+          client = get_client(:template, organization)
           list = client.list
           Mystro::Log.warn Mystro::CLI.list(%w{Name Enabled File}, list)
         end
@@ -146,7 +146,7 @@ module Mystro
       self.default_subcommand = "list"
       subcommand "list", "list environments" do
         def execute
-          client = get_client(:environment, account)
+          client = get_client(:environment, organization)
           list = client.list
           Mystro::Log.warn Mystro::CLI.list(%w{Deleting Name Template Computes Balancers}, list)
         end
@@ -155,7 +155,7 @@ module Mystro
       subcommand "show", "show environment" do
         parameter "name", "id or name of environment"
         def execute
-          client = get_client(:environment, account)
+          client = get_client(:environment, organization)
           response = client.show(name)
           Mystro::Log.warn Mystro::CLI.show(response) if response && response.count > 0
         end
@@ -164,7 +164,7 @@ module Mystro
       subcommand "destroy", "destroy environment" do
         parameter "name", "id or name of environment"
         def execute
-          client = get_client(:environment, account)
+          client = get_client(:environment, organization)
           env = client.show(name)
           raise "environment not found" unless env["id"]
           response = client.destroy(env["id"])
@@ -180,7 +180,7 @@ module Mystro
         option %w{-p --protected}, :flag, "set protected flag on environment", default: false
 
         def execute
-          client = get_client(:environment, account)
+          client = get_client(:environment, organization)
           response = client.create(name, template, protected?)
           if response && response.count > 0
             Mystro::Log.warn Mystro::CLI.show(response)

data/lib/mystro/client/{account.rb → organization.rb}

@@ -1,8 +1,8 @@
 module Mystro
   module Client
-    class Account < Base
+    class Organization < Base
       def list
-        api_get("accounts")
+        api_get("organizations")
       end
     end
   end

data/lib/mystro/client/version.rb

@@ -3,7 +3,7 @@ unless defined?(Mystro::Client::Version)
     module Client
       module Version
         MAJOR  = 0
-        MINOR  = 1
+        MINOR  = 2
         TINY   = 0
         TAG    = nil
         STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')

data/lib/mystro/client.rb

@@ -8,9 +8,9 @@ require "mystro/client/cli"
 module Mystro
   module Client
     class << self
-      def new(klass, server, account, token=nil)
+      def new(klass, server, organization, token=nil)
         k = "Mystro::Client::#{klass.to_s.capitalize}".constantize
-        k.new(server,account,token)
+        k.new(server,organization,token)
       rescue => e
         Mystro::Log.error "class #{klass} not found or error instantiating"
         Mystro::Log.debug e
@@ -21,10 +21,10 @@ module Mystro
     class Base
       include HTTParty
 
-      def initialize(server, account, token=nil)
+      def initialize(server, organization, token=nil)
         @server  = server
         @token   = token
-        @account = account
+        @organization = organization
       end
 
       private
@@ -50,9 +50,9 @@ module Mystro
       end
 
       def api_call(m, u, data={}, headers={})
-        raise "account must be set" unless @account
+        raise "organization must be set" unless @organization
         method = m.to_sym
-        url = url("api/accounts/#@account/#{u}")
+        url = url("api/organizations/#@organization/#{u}")
 
         Mystro::Log.debug "<= #{url}"
         Mystro::Log.debug "=> #{data}" if data && data.count > 0
@@ -83,4 +83,4 @@ end
 require "mystro/client/compute"
 require "mystro/client/environment"
 require "mystro/client/template"
-require "mystro/client/account"
+require "mystro/client/organization"

data/mystro-client.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "mystro-common"
-  gem.add_dependency "httparty" # talk to server's json api
-  gem.add_dependency "clamp"
-  gem.add_dependency "terminal-table"
+  gem.add_dependency 'mystro-common', '~> 0.2.0'
+  gem.add_dependency 'httparty' # talk to server's json api
+  gem.add_dependency 'clamp'
+  gem.add_dependency 'terminal-table'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mystro-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mystro-common
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -93,10 +93,10 @@ files:
 - bin/mystro
 - lib/mystro-client.rb
 - lib/mystro/client.rb
-- lib/mystro/client/account.rb
 - lib/mystro/client/cli.rb
 - lib/mystro/client/compute.rb
 - lib/mystro/client/environment.rb
+- lib/mystro/client/organization.rb
 - lib/mystro/client/template.rb
 - lib/mystro/client/version.rb
 - mystro-client.gemspec