shelly 0.3.8 → 0.4.0.pre

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGM5NmViNjFlMWRiMzQ2OWRhMmRmNjdmZjA2OTc3YmI0M2JmYWUxNg==
+  data.tar.gz: !binary |-
+    N2RlN2M5NzMyMjNmNjcyMjdhMzFlMThiOGQzZWE5NDBlMjBmNzUzZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGM5NGFjMTY5MWYyZWI1MmU4MmQ0NWU3Nzc0ZWJhNDEwMzViZWFiMzBlZjhl
+    NGRlMmRmZTc1NjZkMTM1ZTM4MmU1ZTcwMDFlYTQ3M2VlNWUyOWEzN2UwNWE0
+    NjdjYzRmYTczYjFkNzZlYTNmMDE2ZmQ0YjkzOTM3ZWVhZDFmN2I=
+  data.tar.gz: !binary |-
+    ZGQxNThkYTZjMTgxNGFkYzAzNGJhNGNlY2RkZDM0NWNkMTljOWM0N2UwYWYy
+    M2YxNTlmNmM2ZTkwMGM3OTA0OTZhZTdmZjk0NjZjNWJmNGVlMjZhM2IzODJj
+    YWM0ZmEyY2E2ZjY5N2U2ZmM2ZWQ3NmY4MGY0MTRmZjc5Y2NmYzg=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0.pre / 2013-08-12
+
+* [feature] Added `shelly organization add` to create new organizations
+* [improvement] Create organization and cloud separately
+
 ## 0.3.8 / 2013-08-05
 
 * [bugfix] Show proper path when asking to delete configuration file

data/lib/shelly/app.rb

@@ -9,8 +9,8 @@ module Shelly
     SERVER_SIZES = %w(small large)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains, :web_server_ip, :size, :thin, :redeem_code,
-      :content, :organization, :zone_name
+      :git_url, :domains, :web_server_ip, :size, :thin, :content,
+      :organization_name, :zone_name
 
     def initialize(code_name = nil, content = nil)
       self.code_name = code_name
@@ -62,8 +62,7 @@ module Shelly
 
     def create
       attributes = {:code_name => code_name,
-                    :redeem_code => redeem_code,
-                    :organization_name => organization,
+                    :organization_name => organization_name,
                     :zone_name => zone_name}
       response = shelly.create_app(attributes)
       assign_attributes(response)
@@ -164,10 +163,6 @@ module Shelly
       shelly.deployment(code_name, deployment_id)
     end
 
-    def self.code_name_from_dir_name
-      "#{File.basename(Dir.pwd)}".downcase.dasherize
-    end
-
     def configs
       @configs ||= shelly.app_configs(code_name)
     end
@@ -253,7 +248,7 @@ module Shelly
     end
 
     def edit_billing_url
-      "#{shelly.shellyapp_url}/organizations/#{organization || code_name}/edit"
+      "#{shelly.shellyapp_url}/organizations/#{organization_name || attributes['organization']['name']}/edit"
     end
 
     def open

data/lib/shelly/cli/main.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require "shelly/cli/command"
 require "shelly/cli/user"
 require "shelly/cli/backup"
@@ -9,6 +8,9 @@ require "shelly/cli/file"
 require "shelly/cli/organization"
 require "shelly/cli/logs"
 
+require "shelly/cli/main/add"
+require "shelly/cli/main/check"
+
 module Shelly
   module CLI
     class Main < Command
@@ -80,73 +82,6 @@ module Shelly
         say_error "Use ssh-keygen to generate ssh key pair"
       end
 
-      method_option "code-name", :type => :string, :aliases => "-c",
-        :desc => "Unique code-name of your cloud"
-      method_option :databases, :type => :array, :aliases => "-d",
-        :banner => Shelly::App::DATABASE_CHOICES.join(', '),
-        :desc => "List of databases of your choice"
-      method_option :size, :type => :string, :aliases => "-s",
-        :desc => "Server size [large, small]"
-      method_option "redeem-code", :type => :string, :aliases => "-r",
-        :desc => "Redeem code for free credits"
-      method_option "organization", :type => :string, :aliases => "-o",
-        :desc => "Add cloud to existing organization"
-      method_option "skip-requirements-check", :type => :boolean,
-        :desc => "Skip Shelly Cloud requirements check"
-      method_option "default-organization", :type => :boolean,
-        :desc => "Create cloud with default organization"
-      method_option "zone", :type => :string, :hide => true,
-        :desc => "Create cloud in given zone"
-      desc "add", "Add a new cloud"
-      def add
-        check_options(options)
-        unless options["skip-requirements-check"]
-          return unless check(verbose = false)
-        end
-        app = Shelly::App.new
-        app.code_name = options["code-name"] || ask_for_code_name
-        app.databases = options["databases"] || ask_for_databases
-        app.size = options["size"] || "large"
-        app.redeem_code = options["redeem-code"]
-        unless options["default-organization"]
-          app.organization = options["organization"] || ask_for_organization(app.code_name)
-        end
-        app.zone_name = options["zone"]
-        app.create
-
-        git_remote = add_remote(app)
-
-        say "Creating Cloudfile", :green
-        app.create_cloudfile
-
-        if app.credit > 0 || !app.organization_details_present?
-          say_new_line
-          say "Billing information", :green
-          if app.credit > 0
-            say "#{app.credit.to_i} Euro credit remaining."
-          end
-          if !app.organization_details_present?
-            say "Remember to provide billing details before trial ends."
-            say app.edit_billing_url
-          end
-        end
-
-        info_adding_cloudfile_to_repository
-        info_deploying_to_shellycloud(git_remote)
-
-      rescue Client::ValidationException => e
-        e.each_error { |error| say_error error, :with_exit => false }
-        say_new_line
-        say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
-        say_error "shelly add --code-name=#{app.code_name.downcase.dasherize} --databases=#{app.databases.join(',')} --size=#{app.size}"
-      rescue Client::ForbiddenException
-        say_error "You have to be the owner of '#{options[:organization]}' organization to add clouds"
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :organization
-        say_error "Organization '#{app.organization}' not found", :with_exit => false
-        say_error "You can list organizations you have access to with `shelly organization list`"
-      end
-
       map "status" => :list
       desc "list", "List available clouds"
       def list
@@ -410,126 +345,6 @@ Wait until cloud is in 'turned off' state and try again.}
         say_error "Virtual Server '#{options[:server]}' not found"
       end
 
-      desc "check", "Check if application fulfills Shelly Cloud requirements"
-      # Public: Check if application fulfills shelly's requirements
-      #         and print them
-      # verbose - when true all requirements will be printed out
-      #           together with header and a summary at the end
-      #           when false only not fulfilled requirements will be
-      #           printed
-      # When any requirements is not fulfilled header and summary will
-      # be displayed regardless of verbose value
-      def check(verbose = true)
-        structure = Shelly::StructureValidator.new
-
-        if verbose or structure.invalid? or structure.warnings?
-          say "Checking Shelly Cloud requirements\n\n"
-        end
-
-        print_check(structure.gemfile?, "Gemfile is present",
-          "Gemfile is missing in git repository",
-          :show_fulfilled => verbose)
-
-        print_check(structure.gemfile_lock?, "Gemfile.lock is present",
-          "Gemfile.lock is missing in git repository",
-          :show_fulfilled => verbose)
-
-        print_check(structure.config_ru?, "config.ru is present",
-          "config.ru is missing",
-          :show_fulfilled => verbose)
-
-        print_check(structure.rakefile?, "Rakefile is present",
-          "Rakefile is missing",
-          :show_fulfilled => verbose)
-
-        print_check(!structure.gem?("shelly"),
-          "Gem 'shelly' is not a part of Gemfile",
-          "Gem 'shelly' should not be a part of Gemfile.\n    The versions of the thor gem used by shelly and Rails may be incompatible.",
-          :show_fulfilled => verbose || structure.warnings?,
-          :failure_level => :warning)
-
-        print_check(structure.gem?("shelly-dependencies"),
-          "Gem 'shelly-dependencies' is present",
-          "Gem 'shelly-dependencies' is missing, we recommend to install it\n    See more at https://shellycloud.com/documentation/requirements#shelly-dependencies",
-          :show_fulfilled => verbose || structure.warnings?, :failure_level => :warning)
-
-        print_check(structure.gem?("thin") || structure.gem?("puma"),
-          "Web server gem is present",
-          "Missing web server gem in Gemfile. Currently supported: 'thin' and 'puma'",
-          :show_fulfilled => verbose, :failure_level => :warning)
-
-        print_check(structure.gem?("rake"), "Gem 'rake' is present",
-          "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
-
-        print_check(structure.task?("db:migrate"), "Task 'db:migrate' is present",
-          "Task 'db:migrate' is missing", :show_fulfilled => verbose)
-
-        print_check(structure.task?("db:setup"), "Task 'db:setup' is present",
-          "Task 'db:setup' is missing", :show_fulfilled => verbose)
-
-        cloudfile = Cloudfile.new
-        if cloudfile.present?
-          cloudfile.clouds.each do |app|
-            if app.cloud_databases.include?('postgresql')
-              print_check(structure.gem?("pg") || structure.gem?("postgres"),
-                "Postgresql driver is present for '#{app}' cloud",
-                "Postgresql driver is missing in the Gemfile for '#{app}' cloud,\n    we recommend adding 'pg' gem to Gemfile",
-                :show_fulfilled => verbose)
-            end
-
-            if app.delayed_job?
-              print_check(structure.gem?("delayed_job"),
-                "Gem 'delayed_job' is present for '#{app}' cloud",
-                "Gem 'delayed_job' is missing in the Gemfile for '#{app}' cloud",
-                :show_fulfilled => verbose)
-            end
-
-            if app.whenever?
-              print_check(structure.gem?("whenever"),
-                "Gem 'whenever' is present for '#{app}' cloud",
-                "Gem 'whenever' is missing in the Gemfile for '#{app}' cloud",
-                :show_fulfilled => verbose)
-            end
-
-            if app.sidekiq?
-              print_check(structure.gem?("sidekiq"),
-                "Gem 'sidekiq' is present for '#{app}' cloud",
-                "Gem 'sidekiq' is missing in the Gemfile for '#{app}' cloud",
-                :show_fulfilled => verbose)
-            end
-
-            if app.thin?
-              print_check(structure.gem?("thin"),
-                "Web server gem 'thin' is present",
-                "Gem 'thin' is missing in the Gemfile for '#{app}' cloud",
-                :show_fulfilled => verbose)
-            end
-
-            if app.puma?
-              print_check(structure.gem?("puma"),
-                "Web server gem 'puma' is present",
-                "Gem 'puma' is missing in the Gemfile for '#{app}' cloud",
-                :show_fulfilled => verbose)
-            end
-          end
-        end
-
-        if structure.valid?
-          if verbose
-            say "\nGreat! Your application is ready to run on Shelly Cloud"
-          end
-        else
-          say "\nFix points marked with #{red("✗")} to run your application on the Shelly Cloud"
-          say "See more about requirements on https://shellycloud.com/documentation/requirements"
-        end
-
-        structure.valid?
-      rescue Bundler::BundlerError => e
-        say_new_line
-        say_error e.message, :with_exit => false
-        say_error "Try to run `bundle install`"
-      end
-
       # FIXME: move to helpers
       no_tasks do
         # Returns valid arguments for rake, removes shelly gem arguments
@@ -614,8 +429,8 @@ Wait until cloud is in 'turned off' state and try again.}
         end
 
         def ask_for_code_name
-          default_code_name = Shelly::App.code_name_from_dir_name
-          code_name = ask("Cloud code name (#{Shelly::App.code_name_from_dir_name} - default):")
+          default_code_name = default_name_from_dir_name
+          code_name = ask("Cloud code name (#{default_name_from_dir_name} - default):")
           code_name.blank? ? default_code_name : code_name
         end
 
@@ -632,34 +447,6 @@ Wait until cloud is in 'turned off' state and try again.}
           databases.empty? ? ["postgresql"] : databases
         end
 
-        def ask_for_organization(default_name)
-          organizations = Shelly::User.new.organizations
-          unless organizations.blank?
-            count = organizations.count
-            option_selected = 0
-            loop do
-              say "Select organization for this cloud:"
-              say_new_line
-              say "existing organizations:"
-
-              organizations.each_with_index do |organization, i|
-                print_wrapped "#{i + 1}) #{organization.name}", :ident => 2
-              end
-              say_new_line
-              say "new organization (default as code name):"
-
-              print_wrapped "#{count + 1}) #{default_name}", :ident => 2
-
-              option_selected = ask("Option:")
-              break if ('1'..(count + 1).to_s).include?(option_selected)
-            end
-
-            if (1..count).include?(option_selected.to_i)
-              return organizations[option_selected.to_i - 1].name
-            end
-          end
-        end
-
         def info_adding_cloudfile_to_repository
           say_new_line
           say "Project is now configured for use with Shelly Cloud:", :green

data/lib/shelly/cli/main/add.rb

@@ -0,0 +1,116 @@
+module Shelly
+  module CLI
+    class Main < Command
+
+      method_option "code-name", :type => :string, :aliases => "-c",
+        :desc => "Unique code-name of your cloud"
+      method_option :databases, :type => :array, :aliases => "-d",
+        :banner => Shelly::App::DATABASE_CHOICES.join(', '),
+        :desc => "List of databases of your choice"
+      method_option :size, :type => :string, :aliases => "-s",
+        :desc => "Server size [large, small]"
+      method_option "redeem-code", :type => :string, :aliases => "-r",
+        :desc => "Redeem code for free credits"
+      method_option "organization", :type => :string, :aliases => "-o",
+        :desc => "Add cloud to existing organization"
+      method_option "skip-requirements-check", :type => :boolean,
+        :desc => "Skip Shelly Cloud requirements check"
+      method_option "zone", :type => :string, :hide => true,
+        :desc => "Create cloud in given zone"
+      desc "add", "Add a new cloud"
+      def add
+        check_options(options)
+        unless options["skip-requirements-check"]
+          return unless check(verbose = false)
+        end
+        app = Shelly::App.new
+        app.code_name = options["code-name"] || ask_for_code_name
+        app.databases = options["databases"] || ask_for_databases
+        app.size = options["size"] || "large"
+        app.organization_name = options["organization"] || ask_for_organization(options)
+        app.zone_name = options["zone"]
+        app.create
+        say "Cloud '#{app}' created in '#{app.organization_name}' organization", :green
+        say_new_line
+
+        git_remote = add_remote(app)
+
+        say "Creating Cloudfile", :green
+        app.create_cloudfile
+
+        if app.credit > 0 || !app.organization_details_present?
+          say_new_line
+          say "Billing information", :green
+          if app.credit > 0
+            say "#{app.credit.to_i} Euro credit remaining."
+          end
+          if !app.organization_details_present?
+            say "Remember to provide billing details before trial ends."
+            say app.edit_billing_url
+          end
+        end
+
+        info_adding_cloudfile_to_repository
+        info_deploying_to_shellycloud(git_remote)
+
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+        say_new_line
+        say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
+        say_error "shelly add --code-name=#{app.code_name.downcase.dasherize} --databases=#{app.databases.join(',')} --organization=#{app.organization_name} --size=#{app.size}"
+      rescue Client::ForbiddenException
+        say_error "You have to be the owner of '#{options[:organization]}' organization to add clouds"
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :organization
+        say_error "Organization '#{app.organization_name}' not found", :with_exit => false
+        say_error "You can list organizations you have access to with `shelly organization list`"
+      end
+
+      no_tasks do
+        def ask_for_organization(options)
+          organizations = Shelly::User.new.organizations
+          if organizations.blank?
+            ask_for_new_organization(options)
+          else
+            count = organizations.count
+            option_selected = 0
+            loop do
+              say "Select organization for this cloud:"
+              say_new_line
+              say "existing organizations:"
+
+              organizations.each_with_index do |organization, i|
+                print_wrapped "#{i + 1}) #{organization.name}", :ident => 2
+              end
+              say_new_line
+
+              print_wrapped "#{count + 1}) provide name for new organization", :ident => 2
+
+              option_selected = ask("Option:")
+              break if ('1'..(count + 1).to_s).include?(option_selected)
+            end
+
+            if option_selected.to_i == count + 1
+              return ask_for_new_organization(options)
+            end
+
+            if (1..count).include?(option_selected.to_i)
+              return organizations[option_selected.to_i - 1].name
+            end
+          end
+        end
+
+        def ask_for_new_organization(options = {})
+          loop do
+            begin
+              return create_new_organization(options)
+            rescue Client::ValidationException => e
+              e.each_error { |error| say_error error, :with_exit => false }
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/shelly/cli/main/check.rb

@@ -0,0 +1,127 @@
+# encoding: utf-8
+
+module Shelly
+  module CLI
+    class Main < Command
+      desc "check", "Check if application fulfills Shelly Cloud requirements"
+      # Public: Check if application fulfills shelly's requirements
+      #         and print them
+      # verbose - when true all requirements will be printed out
+      #           together with header and a summary at the end
+      #           when false only not fulfilled requirements will be
+      #           printed
+      # When any requirements is not fulfilled header and summary will
+      # be displayed regardless of verbose value
+      def check(verbose = true)
+        structure = Shelly::StructureValidator.new
+
+        if verbose or structure.invalid? or structure.warnings?
+          say "Checking Shelly Cloud requirements\n\n"
+        end
+
+        print_check(structure.gemfile?, "Gemfile is present",
+          "Gemfile is missing in git repository",
+          :show_fulfilled => verbose)
+
+        print_check(structure.gemfile_lock?, "Gemfile.lock is present",
+          "Gemfile.lock is missing in git repository",
+          :show_fulfilled => verbose)
+
+        print_check(structure.config_ru?, "config.ru is present",
+          "config.ru is missing",
+          :show_fulfilled => verbose)
+
+        print_check(structure.rakefile?, "Rakefile is present",
+          "Rakefile is missing",
+          :show_fulfilled => verbose)
+
+        print_check(!structure.gem?("shelly"),
+          "Gem 'shelly' is not a part of Gemfile",
+          "Gem 'shelly' should not be a part of Gemfile.\n    The versions of the thor gem used by shelly and Rails may be incompatible.",
+          :show_fulfilled => verbose || structure.warnings?,
+          :failure_level => :warning)
+
+        print_check(structure.gem?("shelly-dependencies"),
+          "Gem 'shelly-dependencies' is present",
+          "Gem 'shelly-dependencies' is missing, we recommend to install it\n    See more at https://shellycloud.com/documentation/requirements#shelly-dependencies",
+          :show_fulfilled => verbose || structure.warnings?, :failure_level => :warning)
+
+        print_check(structure.gem?("thin") || structure.gem?("puma"),
+          "Web server gem is present",
+          "Missing web server gem in Gemfile. Currently supported: 'thin' and 'puma'",
+          :show_fulfilled => verbose, :failure_level => :warning)
+
+        print_check(structure.gem?("rake"), "Gem 'rake' is present",
+          "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
+
+        print_check(structure.task?("db:migrate"), "Task 'db:migrate' is present",
+          "Task 'db:migrate' is missing", :show_fulfilled => verbose)
+
+        print_check(structure.task?("db:setup"), "Task 'db:setup' is present",
+          "Task 'db:setup' is missing", :show_fulfilled => verbose)
+
+        cloudfile = Cloudfile.new
+        if cloudfile.present?
+          cloudfile.clouds.each do |app|
+            if app.cloud_databases.include?('postgresql')
+              print_check(structure.gem?("pg") || structure.gem?("postgres"),
+                "Postgresql driver is present for '#{app}' cloud",
+                "Postgresql driver is missing in the Gemfile for '#{app}' cloud,\n    we recommend adding 'pg' gem to Gemfile",
+                :show_fulfilled => verbose)
+            end
+
+            if app.delayed_job?
+              print_check(structure.gem?("delayed_job"),
+                "Gem 'delayed_job' is present for '#{app}' cloud",
+                "Gem 'delayed_job' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
+
+            if app.whenever?
+              print_check(structure.gem?("whenever"),
+                "Gem 'whenever' is present for '#{app}' cloud",
+                "Gem 'whenever' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
+
+            if app.sidekiq?
+              print_check(structure.gem?("sidekiq"),
+                "Gem 'sidekiq' is present for '#{app}' cloud",
+                "Gem 'sidekiq' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
+
+            if app.thin?
+              print_check(structure.gem?("thin"),
+                "Web server gem 'thin' is present",
+                "Gem 'thin' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
+
+            if app.puma?
+              print_check(structure.gem?("puma"),
+                "Web server gem 'puma' is present",
+                "Gem 'puma' is missing in the Gemfile for '#{app}' cloud",
+                :show_fulfilled => verbose)
+            end
+          end
+        end
+
+        if structure.valid?
+          if verbose
+            say "\nGreat! Your application is ready to run on Shelly Cloud"
+          end
+        else
+          say "\nFix points marked with #{red("✗")} to run your application on the Shelly Cloud"
+          say "See more about requirements on https://shellycloud.com/documentation/requirements"
+        end
+
+        structure.valid?
+      rescue Bundler::BundlerError => e
+        say_new_line
+        say_error e.message, :with_exit => false
+        say_error "Try to run `bundle install`"
+      end
+    end
+  end
+end

data/lib/shelly/cli/organization.rb

@@ -6,7 +6,7 @@ module Shelly
       namespace :organization
       include Helpers
 
-      before_hook :logged_in?, :only => [:list]
+      before_hook :logged_in?, :only => [:list, :add]
 
       desc "list", "Lists organizations"
       def list
@@ -23,6 +23,16 @@ module Shelly
           end
         end
       end
+
+      method_option "redeem-code", :type => :string, :aliases => "-r",
+        :desc => "Redeem code for free credits"
+      desc "add", "Add a new organization"
+      def add
+        create_new_organization(options)
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+        exit 1
+      end
     end
   end
 end

data/lib/shelly/client/organizations.rb

@@ -7,6 +7,10 @@ class Shelly::Client
     get("/organizations/#{name}")
   end
 
+  def create_organization(attributes)
+    post("/organizations", :organization => attributes)
+  end
+
   def members(name)
     get("/organizations/#{name}/memberships")
   end

data/lib/shelly/helpers.rb

@@ -23,6 +23,17 @@ module Shelly
       say message, :yellow
     end
 
+    # Extracted into a helper so can be used when adding cloud Main#add and
+    # Organization#add
+    def create_new_organization(options = {})
+      organization = Shelly::Organization.new
+      organization.name = ask_for_organization_name
+      organization.redeem_code = options["redeem-code"]
+      organization.create
+      say "Organization '#{organization.name}' created", :green
+      organization.name
+    end
+
     def ask_for_email(options = {})
       options = {:guess_email => true}.merge(options)
       email_question = options[:guess_email] && !User.guess_email.blank? ? "Email (#{User.guess_email} - default):" : "Email:"
@@ -59,6 +70,16 @@ module Shelly
       exit 1 unless yes?(reset_database_question)
     end
 
+    def ask_for_organization_name
+      default_name = default_name_from_dir_name
+      name = ask("Organization name (#{default_name} - default):")
+      name.blank? ? default_name : name
+    end
+
+    def default_name_from_dir_name
+      "#{File.basename(Dir.pwd)}".downcase.dasherize
+    end
+
     def inside_git_repository?
       unless App.inside_git_repository?
         say_error %q{Current directory is not a git repository.

data/lib/shelly/organization.rb

@@ -1,6 +1,6 @@
 module Shelly
   class Organization < Model
-    attr_reader :name, :app_code_names
+    attr_accessor :name, :app_code_names, :redeem_code
 
     def initialize(attributes = {})
       @name           = attributes["name"]
@@ -13,6 +13,11 @@ module Shelly
       end
     end
 
+    def create
+      attributes = {:name => name, :redeem_code => redeem_code}
+      shelly.create_organization(attributes)
+    end
+
     def memberships
       @members ||= Array(shelly.members(name)).
         sort_by { |c| c["email"] }

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.3.8"
+  VERSION = "0.4.0.pre"
 end

data/spec/input_faker.rb

@@ -1,6 +1,6 @@
 class InputFaker
   def initialize(strings)
-    @strings = strings
+    @strings = Array(strings)
   end
 
   def gets

data/spec/shelly/app_spec.rb

@@ -10,13 +10,6 @@ describe Shelly::App do
     @app = Shelly::App.new('foo-staging')
   end
 
-  describe ".code_name_from_dir_name" do
-    it "should downcase and dasherize code name" do
-      Dir.stub(:pwd).and_return("/project/FOO")
-      Shelly::App.code_name_from_dir_name.should == "foo"
-    end
-  end
-
   describe "#databases=" do
     it "should remove 'none' as possible database" do
       @app.databases = %w{none postgresql}
@@ -249,10 +242,8 @@ describe Shelly::App do
   describe "#create" do
     it "should create the app on shelly cloud via API client" do
       @app.code_name = "fooo"
-      @app.redeem_code = "foo123"
       attributes = {
         :code_name => "fooo",
-        :redeem_code => "foo123",
         :organization_name => nil,
         :zone_name => nil
       }
@@ -333,7 +324,7 @@ describe Shelly::App do
 
   describe "#edit_billing_url" do
     it "should return link to edit billing page for app" do
-      @app.stub(:organization).and_return("example")
+      @app.stub(:organization_name).and_return("example")
       @app.edit_billing_url.should == "http://shellyapp.example.com/organizations/example/edit"
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -406,7 +406,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     it "should create the app on shelly cloud and show credit information" do
       @app.stub(:attributes).and_return(
         "organization" => {"credit" => "40", "details_present" => false})
-      @app.stub(:organization).and_return("example")
+      @app.stub(:organization_name).and_return("example")
       @app.should_receive(:create)
       $stdout.should_receive(:puts).with(green "Billing information")
       $stdout.should_receive(:puts).with("40 Euro credit remaining.")
@@ -430,10 +430,11 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     it "should display validation errors if they are any" do
       body = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
       exception = Shelly::Client::ValidationException.new(body)
+      @app.stub(:organization_name).and_return("org-name")
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with(red "Code name has been already taken")
       $stdout.should_receive(:puts).with(red "Fix erros in the below command and type it again to create your cloud")
-      $stdout.should_receive(:puts).with(red "shelly add --code-name=big-letters --databases=postgresql --size=large")
+      $stdout.should_receive(:puts).with(red "shelly add --code-name=big-letters --databases=postgresql --organization=org-name --size=large")
       lambda {
         fake_stdin(["BiG_LETTERS", ""]) do
           invoke(@main, :add)
@@ -545,14 +546,14 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       end.to raise_error(SystemExit)
     end
 
-    context "organizations" do
+    context "organization" do
       before do
         @main.unstub(:ask_for_organization)
       end
 
       it "should use --organization option" do
         @main.options = {"organization" => "foo"}
-        @app.should_receive(:organization=).with("foo")
+        @app.should_receive(:organization_name=).with("foo")
         fake_stdin(["foooo", "none"]) do
           invoke(@main, :add)
         end
@@ -564,37 +565,45 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         end
 
         it "should ask user to choose organization if present and use chosen organization" do
-          @app.should_receive(:organization=).with("aaa")
+          @app.should_receive(:organization_name=).with("aaa")
           $stdout.should_receive(:puts).with("Select organization for this cloud:")
           $stdout.should_receive(:puts).with("existing organizations:")
           $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("new organization (default as code name):")
-          $stdout.should_receive(:puts).with("  2) foooo")
+          $stdout.should_receive(:puts).with("  2) provide name for new organization")
           $stdout.should_receive(:print).with("Option: ")
           fake_stdin(["foooo", "none", "1"]) do
             invoke(@main, :add)
           end
         end
 
-        it "should ask user to choose organization if present" do
-          @app.should_receive(:organization=).with(nil)
+        it "should ask user to create new organization" do
+          @main.options = {'redeem-code' => 'discount'}
+          @client.should_receive(:create_organization).
+            with({:name => "org-name", :redeem_code => 'discount'})
+          @app.should_receive(:organization_name=).with('org-name')
           $stdout.should_receive(:puts).with("Select organization for this cloud:")
           $stdout.should_receive(:puts).with("existing organizations:")
           $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("new organization (default as code name):")
-          $stdout.should_receive(:puts).with("  2) foooo")
+          $stdout.should_receive(:puts).with("  2) provide name for new organization")
           $stdout.should_receive(:print).with("Option: ")
-          fake_stdin(["foooo", "none", "2"]) do
+          $stdout.should_receive(:print).with("Organization name (foo - default): ")
+          $stdout.should_receive(:puts).with(green "Organization 'org-name' created")
+          fake_stdin(["foooo", "none", "2", "org-name"]) do
             invoke(@main, :add)
           end
         end
-      end
 
-      context "default-organizaation" do
-        it "should not ask for organization" do
-          @main.options = {"default-organization" => true}
-          @app.should_not_receive(:organization=)
-          fake_stdin(["foooo", "none"]) do
+        it "should use redeem-code option" do
+          @client.should_receive(:create_organization).
+            with({:name => "org-name", :redeem_code => nil})
+          $stdout.should_receive(:puts).with("Select organization for this cloud:")
+          $stdout.should_receive(:puts).with("existing organizations:")
+          $stdout.should_receive(:puts).with("  1) aaa")
+          $stdout.should_receive(:puts).with("  2) provide name for new organization")
+          $stdout.should_receive(:print).with("Option: ")
+          $stdout.should_receive(:print).with("Organization name (foo - default): ")
+          $stdout.should_receive(:puts).with(green "Organization 'org-name' created")
+          fake_stdin(["foooo", "none", "2", "org-name"]) do
             invoke(@main, :add)
           end
         end

data/spec/shelly/cli/organization_spec.rb

@@ -4,8 +4,8 @@ require "shelly/cli/organization"
 describe Shelly::CLI::Organization do
   before do
     FileUtils.stub(:chmod)
-    @organization = Shelly::CLI::Organization.new
-    Shelly::CLI::Organization.stub(:new).and_return(@organization)
+    @cli = Shelly::CLI::Organization.new
+    Shelly::CLI::Organization.stub(:new).and_return(@cli)
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     $stdout.stub(:puts)
@@ -28,7 +28,7 @@ describe Shelly::CLI::Organization do
     end
 
     it "should ensure user has logged in" do
-      hooks(@organization, :list).should include(:logged_in?)
+      hooks(@cli, :list).should include(:logged_in?)
     end
 
     it "should print out all organizations with apps" do
@@ -38,7 +38,51 @@ describe Shelly::CLI::Organization do
       $stdout.should_receive(:puts).with(green("ccc"))
       $stdout.should_receive(:puts).with(/app2 \s+ |  turned off/)
       $stdout.should_receive(:puts).with(/app3 \s+ |  no code/)
-      invoke(@organization, :list)
+      invoke(@cli, :list)
+    end
+  end
+
+  describe "#add" do
+    before do
+      @organization = Shelly::Organization.new
+      Shelly::Organization.stub(:new).and_return(@organization)
+      @organization.stub(:create)
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@cli, :add).should include(:logged_in?)
+    end
+
+    it "should create new organization" do
+      @organization.should_receive(:create)
+      $stdout.should_receive(:print).with("Organization name (foo - default): ")
+      $stdout.should_receive(:puts).with(green "Organization 'org-name' created")
+      fake_stdin("org-name") do
+        invoke(@cli, :add)
+      end
+    end
+
+    it "should accept redeem-code option" do
+      @organization.should_receive(:redeem_code=).with("discount")
+      @cli.options = {"redeem-code" => "discount"}
+      fake_stdin("org-name") do
+        invoke(@cli, :add)
+      end
+    end
+
+    context "on failure" do
+      it "should display validation errors" do
+        body = {"message" => "Validation Failed", "errors" =>
+          [["name", "has been already taken"]]}
+        exception = Shelly::Client::ValidationException.new(body)
+        @organization.should_receive(:create).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Name has been already taken")
+        lambda {
+          fake_stdin("org-name") do
+            invoke(@cli, :add)
+          end
+        }.should raise_error(SystemExit)
+      end
     end
   end
 end

data/spec/shelly/client_spec.rb

@@ -170,12 +170,6 @@ describe Shelly::Client do
 
   describe "#create_app" do
     it "should send post with app's attributes" do
-      @client.should_receive(:post).with("/apps", :app => {:code_name => "foo",
-        :ruby_version => "1.9.2"}, :organization_name => nil, :zone_name => nil)
-      @client.create_app(:code_name => "foo", :ruby_version => "1.9.2")
-    end
-
-    it "should send post with app's attributes and organization name" do
       @client.should_receive(:post).with("/apps", :app => {:code_name => "foo",
         :ruby_version => "1.9.2"}, :organization_name => "foo", :zone_name => 'eu1')
       @client.create_app(:code_name => "foo", :ruby_version => "1.9.2",
@@ -194,6 +188,14 @@ describe Shelly::Client do
     end
   end
 
+  describe "#create_organization" do
+    it "should send post with organization's attributes" do
+      @client.should_receive(:post).with("/organizations",
+        :organization => {:name => "new-organization"})
+      @client.create_organization(:name => "new-organization")
+    end
+  end
+
   describe "#organization" do
     it "should fetch organization from API" do
       FakeWeb.register_uri(:get, api_url("organizations/foo-org"),

data/spec/shelly/organization_spec.rb

@@ -62,6 +62,16 @@ describe Shelly::Organization do
     end
   end
 
+  describe "#create" do
+    it "should create organization via API client" do
+      @client.should_receive(:create_organization).with(
+        :name => "new-organization", :redeem_code => "discount")
+      @organization.name = "new-organization"
+      @organization.redeem_code = "discount"
+      @organization.create
+    end
+  end
+
   describe "#send_invitation" do
     it "should send invitation" do
       @client.should_receive(:send_invitation).with("foo-org", "megan@example.com", true)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.3.8
-  prerelease: 
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,34 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +188,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -249,6 +250,8 @@ files:
 - lib/shelly/cli/file.rb
 - lib/shelly/cli/logs.rb
 - lib/shelly/cli/main.rb
+- lib/shelly/cli/main/add.rb
+- lib/shelly/cli/main/check.rb
 - lib/shelly/cli/organization.rb
 - lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
@@ -306,32 +309,48 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1190904301794294451
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1190904301794294451
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shelly Cloud command line tool
-test_files: []
+test_files:
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/backup_spec.rb
+- spec/shelly/cli/backup_spec.rb
+- spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/database_spec.rb
+- spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/file_spec.rb
+- spec/shelly/cli/logs_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/organization_spec.rb
+- spec/shelly/cli/runner_spec.rb
+- spec/shelly/cli/user_spec.rb
+- spec/shelly/client_spec.rb
+- spec/shelly/cloudfile_spec.rb
+- spec/shelly/download_progress_bar_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/organization_spec.rb
+- spec/shelly/structure_validator_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb