shelly 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5400f1e980ab492924c5d9d6b67fb9a671d93d7f
-  data.tar.gz: 435c76b4729f0935dcaec9fa16c7131023ab3dde
+  metadata.gz: b8ceb2fd1ee786894862ba5705645a85570e3cd2
+  data.tar.gz: 09486cb2b72d9926e1e9788f6aa47adbadc13fea
 SHA512:
-  metadata.gz: c2a6937d6fafd7926a27261bb033fcf6f4995c585fd14448514d3268686958deb7533ea89183ededeeb92ed934eb44881351847c2051e66e0ff8877559387a53
-  data.tar.gz: ae28007a02699354345cbbefa65841a14713508899eec426a46f345342407b812f089adfd5a759f80ad0b3ce33bb982bb34ac9ae0a69efa420f85359e923134d
+  metadata.gz: 88c7950e4fa032ecbdadd102520fd5d824e16980dda250aa270e449671840fbefa1f72aa836621151c83a78f1eb4c97d2306dd626ab1b1b1a4b13915c2bd3c1a
+  data.tar.gz: b34402a098cb424aea9e1f843a31f411c499656e2caaf8b8cfc52ca913514129a73682e0d175e591b2cbb20c58f0c511df3540b3eee83ad2eadec61527e86b6d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.3 / 2015-02-15
+
+* [bugfix] Don't ask user about assigning new ip address on creating new
+  endpoint with SNI
+* [improvement] User is able to provide referral code for new organization
+
 ## 0.5.2 / 2015-02-11
 
 * [improvement] Disable email confirmation on registration

data/lib/shelly/cli/endpoint.rb

@@ -79,6 +79,7 @@ module Shelly
       def create(cert_path = nil, key_path = nil, bundle_path = nil)
         app = multiple_clouds(options[:cloud],
           "endpoint create [CERT_PATH] [KEY_PATH] [BUNDLE_PATH]")
+        sni = options["sni"]
 
         say "Every unique IP address assigned to endpoint costs 10€/month"
         say "It's required for SSL/TLS"
@@ -87,7 +88,7 @@ module Shelly
           say "Assigned IP address can be used to catch all domains pointing to that address, without SSL/TLS enabled"
           exit(0) unless yes?("Are you sure you want to create endpoint without certificate (yes/no):")
         elsif app.endpoints.count > 0
-          ask_if_endpoints_were_already_created(app)
+          ask_if_endpoints_were_already_created(app, sni)
         else
           exit(0) unless yes?("Are you sure you want to create endpoint? (yes/no):")
         end
@@ -95,7 +96,7 @@ module Shelly
         certificate, key = read_certificate_components(cert_path, key_path,
           bundle_path)
 
-        endpoint = app.create_endpoint(certificate, key, options["sni"])
+        endpoint = app.create_endpoint(certificate, key, sni)
 
         say "Endpoint was created for #{app} cloud", :green
         if endpoint['ip_address']
@@ -184,14 +185,19 @@ module Shelly
           end
         end
 
-        def ask_if_endpoints_were_already_created(app)
+        def ask_if_endpoints_were_already_created(app, sni)
           cli = Shelly::CLI::Endpoint.new
           cli.options = {:cloud => app}
           cli.list
           say_new_line
-          exit(0) unless yes?("You already have assigned endpoint(s). Are " \
-            "you sure you want to create another one with a new IP address? " \
-            "(yes/no):")
+          question = unless sni.nil?
+            "You already have assigned endpoint(s). Are you sure you" \
+            " want to create another one with SNI? (yes/no):"
+          else
+            "You already have assigned endpoint(s). Are you sure you" \
+            " want to create another one with a new IP address? (yes/no):"
+          end
+          exit(0) unless yes?(question)
         end
       end
     end

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

@@ -11,6 +11,8 @@ module Shelly
         :desc => "Server size [large, small]"
       method_option "redeem-code", :type => :string, :aliases => "-r",
         :desc => "Redeem code for free credits"
+      method_option "referral-code", :type => :string,
+        :desc => "Referral code for additional credit"
       method_option "organization", :type => :string, :aliases => "-o",
         :desc => "Add cloud to existing organization"
       method_option "skip-requirements-check", :type => :boolean,

data/lib/shelly/cli/organization.rb

@@ -26,6 +26,8 @@ module Shelly
 
       method_option "redeem-code", :type => :string, :aliases => "-r",
         :desc => "Redeem code for free credits"
+      method_option "referral-code", :type => :string,
+        :desc => "Referral code for additional credit"
       desc "add", "Add a new organization"
       map "create" => :add
       map "new" => :add

data/lib/shelly/client/organizations.rb

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

data/lib/shelly/helpers.rb

@@ -24,6 +24,7 @@ module Shelly
       organization = Shelly::Organization.new
       organization.name = ask_for_organization_name
       organization.redeem_code = options["redeem-code"]
+      organization.referral_code = options["referral-code"]
       organization.create
       say "Organization '#{organization.name}' created", :green
       organization.name

data/lib/shelly/organization.rb

@@ -1,6 +1,6 @@
 module Shelly
   class Organization < Model
-    attr_accessor :name, :app_code_names, :redeem_code
+    attr_accessor :name, :app_code_names, :redeem_code, :referral_code
 
     def initialize(attributes = {})
       @name           = attributes["name"]
@@ -15,7 +15,7 @@ module Shelly
 
     def create
       attributes = {:name => name, :redeem_code => redeem_code}
-      shelly.create_organization(attributes)
+      shelly.create_organization(attributes, referral_code)
     end
 
     def memberships

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/shelly/cli/endpoint_spec.rb

@@ -76,21 +76,49 @@ describe Shelly::CLI::Endpoint do
       @app.stub(:endpoints).and_return([])
     end
 
-    it "should create endpoint with provided certificate" do
-      @app.should_receive(:create_endpoint).with("crt\n", "key", true).
-        and_return(endpoint_response('ip_address' => '10.0.0.1'))
+    context "with certificate" do
+      it "should create endpoint with provided certificate" do
+        @app.should_receive(:create_endpoint).with("crt\n", "key", nil).
+          and_return(endpoint_response('ip_address' => '10.0.0.1'))
 
-      $stdout.should_receive(:puts).with("Every unique IP address assigned to endpoint costs 10\u20AC/month")
-      $stdout.should_receive(:puts).with("It's required for SSL/TLS")
-      $stdout.should_receive(:print).with("Are you sure you want to create endpoint? (yes/no): ")
+        $stdout.should_receive(:puts).with("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+        $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+        $stdout.should_receive(:print).with("Are you sure you want to create endpoint? (yes/no): ")
 
-      $stdout.should_receive(:puts).with(green "Endpoint was created for #{@app.to_s} cloud")
-      $stdout.should_receive(:puts).with("Deployed certificate on front end servers.")
-      $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
+        $stdout.should_receive(:puts).with(green "Endpoint was created for #{@app.to_s} cloud")
+        $stdout.should_receive(:puts).with("Deployed certificate on front end servers.")
+        $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
 
-      @cli.options = {"sni" => true}
-      fake_stdin(["yes"]) do
-        invoke(@cli, :create, "crt_path", "key_path")
+        fake_stdin(["yes"]) do
+          invoke(@cli, :create, "crt_path", "key_path")
+        end
+      end
+
+      context "when sni option is true" do
+        before do
+          @app.stub_chain(:endpoints, :count).and_return(1)
+          @cli.stub(:list)
+        end
+
+        it "should create endpoint with provided certificate" do
+          @app.should_receive(:create_endpoint).with("crt\n", "key", true).
+            and_return(endpoint_response('ip_address' => '10.0.0.1'))
+
+          $stdout.should_receive(:puts).with("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+          $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+          $stdout.should_receive(:puts).with("\n")
+          $stdout.should_receive(:print).with("You already have assigned" \
+            " endpoint(s). Are you sure you want to create another one with" \
+            " SNI? (yes/no): ")
+          $stdout.should_receive(:puts).with(green "Endpoint was created for #{@app.to_s} cloud")
+          $stdout.should_receive(:puts).with("Deployed certificate on front end servers.")
+          $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
+
+          @cli.options = {"sni" => true}
+          fake_stdin(["yes"]) do
+            invoke(@cli, :create, "crt_path", "key_path")
+          end
+        end
       end
     end
 

data/spec/shelly/cli/main_spec.rb

@@ -668,7 +668,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         it "should ask user to create a new organization" do
           @app.should_receive(:organization_name=).with('org-name')
           @client.should_receive(:create_organization).
-            with({:name => "org-name", :redeem_code => nil})
+            with({:name => "org-name", :redeem_code => nil}, nil)
           $stdout.should_receive(:print).
             with("Organization name (foo - default): ")
           $stdout.should_receive(:puts).
@@ -681,7 +681,16 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         it "should use --redeem-code option" do
           @main.options = {'redeem-code' => 'discount'}
           @client.should_receive(:create_organization).
-            with({:name => "org-name", :redeem_code => 'discount'})
+            with({:name => "org-name", :redeem_code => 'discount'}, nil)
+          fake_stdin(["foo", "none", "", "org-name"]) do
+            invoke(@main, :add)
+          end
+        end
+
+        it "should use --referral-code option" do
+          @main.options = {'referral-code' => 'test'}
+          @client.should_receive(:create_organization).
+            with({:name => "org-name", :redeem_code=>nil}, 'test')
           fake_stdin(["foo", "none", "", "org-name"]) do
             invoke(@main, :add)
           end

data/spec/shelly/cli/organization_spec.rb

@@ -85,6 +85,14 @@ describe Shelly::CLI::Organization do
       end
     end
 
+    it "should accept referral-code option" do
+      @organization.should_receive(:referral_code=).with("test")
+      @cli.options = {"referral-code" => "test"}
+      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" =>

data/spec/shelly/client_spec.rb

@@ -192,7 +192,7 @@ describe Shelly::Client do
   describe "#create_organization" do
     it "should send post with organization's attributes" do
       @client.should_receive(:post).with("/organizations",
-        :organization => {:name => "new-organization"})
+        {:organization=>{:name=>"new-organization"}, :referral_code=>nil})
       @client.create_organization(:name => "new-organization")
     end
   end

data/spec/shelly/organization_spec.rb

@@ -65,9 +65,10 @@ describe Shelly::Organization do
   describe "#create" do
     it "should create organization via API client" do
       @client.should_receive(:create_organization).with(
-        :name => "new-organization", :redeem_code => "discount")
+        {:name=>"new-organization", :redeem_code=>"discount"}, "test")
       @organization.name = "new-organization"
       @organization.redeem_code = "discount"
+      @organization.referral_code = "test"
       @organization.create
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool