shelly 0.4.39 → 0.4.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5d9e5112799516f4300810c0c9d4bc63a755a18
-  data.tar.gz: ef02f4bd1ef58a34a5c72a566e22d99a685938dc
+  metadata.gz: 84c1d64a86a017e242fc6be31608fb2dabbb010c
+  data.tar.gz: e6802beb39c881e5f473aff3e92d7848f96b62d9
 SHA512:
-  metadata.gz: 3eaac18b74f4977637ff4d26d0d019ba4f3288a469caaa819fde9b90190c850198ec184ca0e4bf67c25d9bb7bc65ca105fd4e9c4e446bcd72cd5bc22c0f953de
-  data.tar.gz: 8fa35d39646836f2405484650bbba28b26b8f836349d7ff9e0e68e5c5b58b12a7cc4e3bab8e0c1cfe64554f6306f0e900f43efca319319ef6a2f803d63e43d6a
+  metadata.gz: 9ae10bb18d94e0e3a39b0f0156fdf98ac71dd9eb987bba1786f0f53569ca8b5e4ff2649e2bb79e07185f755f8f1d1e9c21236c1a2e8b4074c62beb46fad50c1b
+  data.tar.gz: 1135c9a246017c14933a42035d1ae7eafe21a9742236dedd4300ffd5a16e4f7f9ab0481c651d458f49210f0b48d05b4762fc03e4bea7c5fa6208b7100b429212

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.40 / 2014-12-4
+
+* [feature] MySQL support
+* [bugfix] Added dependency on childprocess' version
+* [bugfix] Added UUID for show action in message given by `shelly endpoint help`
+
 ## 0.4.39 / 2014-11-17
 
 * [improvement] API changed to support multiple certificates and IP addresses,

data/lib/shelly/app.rb

@@ -8,7 +8,7 @@ module Shelly
   class App < Model
     include ::Shellwords
 
-    DATABASE_KINDS = %w(postgresql mongodb redis)
+    DATABASE_KINDS = %w(postgresql mysql mongodb redis)
     DATABASE_CHOICES = DATABASE_KINDS + %w(none)
     SERVER_SIZES = %w(small large)
 

data/lib/shelly/cli/backup.rb

@@ -70,7 +70,8 @@ module Shelly
         app = multiple_clouds(options[:cloud], "backup create [DB_KIND]")
         cloudfile = Cloudfile.new
         unless kind || cloudfile.present?
-          say_error "Cloudfile must be present in current working directory or specify database kind with:", :with_exit => false
+          say_error "Cloudfile must be present in current working directory " \
+            "or specify database kind with:", :with_exit => false
           say_error "`shelly backup create DB_KIND`"
         end
         app.request_backup(kind || app.backup_databases)
@@ -87,7 +88,8 @@ module Shelly
       def restore(filename)
         app = multiple_clouds(options[:cloud], "backup restore FILENAME")
         backup = app.database_backup(filename)
-        say "You are about to restore #{backup.kind} database for cloud #{backup.code_name} to state from #{backup.filename}"
+        say "You are about to restore #{backup.kind} database for cloud" \
+          " #{backup.code_name} to state from #{backup.filename}"
         say_new_line
         ask_to_restore_database
         app.restore_backup(filename)
@@ -114,8 +116,9 @@ module Shelly
         unless ::File.exist?(filename)
           say_error "File #{filename} doesn't exist"
         end
-        unless ['postgresql', 'mongodb'].include?(kind)
-          say_error "Kind is invalid. You can import backup of: postgresql, mongodb"
+        unless ['postgresql', 'mysql', 'mongodb'].include?(kind)
+          say_error "Kind is invalid. You can import backup of: postgresql, " \
+            "mysql, mongodb"
         end
         if options[:reset]
           say_warning "You are about to reset database #{kind} for cloud #{app}"
@@ -124,7 +127,8 @@ module Shelly
           say_new_line
           yes?(question) ? app.reset_database(kind) : say_error("Canceled")
         else
-          say_warning "You are about to import #{kind} database for cloud #{app} to state from file #{filename}"
+          say_warning "You are about to import #{kind} database for cloud " \
+            "#{app} to state from file #{filename}"
           question = "I want to import the database from dump (yes/no):"
           say_new_line
           say_error "Canceled" unless yes?(question)

data/lib/shelly/cli/endpoint.rb

@@ -40,10 +40,9 @@ module Shelly
         end
       end
 
-      desc "show", "Show detail information about HTTP endpoint"
+      desc "show UUID", "Show detail information about HTTP endpoint"
       def show(uuid)
         app = multiple_clouds(options[:cloud], "endpoint show UUID")
-
         endpoint = app.endpoint(uuid)
 
         say "UUID: #{endpoint['uuid']}"

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.39"
+  VERSION = "0.4.40"
 end

data/shelly.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "ruby-progressbar"
   s.add_runtime_dependency "launchy"
   s.add_runtime_dependency "netrc"
-  s.add_runtime_dependency "childprocess"
+  s.add_runtime_dependency "childprocess", "~> 0.5.5"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/shelly/cli/main_spec.rb

@@ -401,7 +401,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     it "should use database provided by user (separated by comma or space)" do
       $stdout.should_receive(:print).
         with("Which databases do you want to use " \
-             "postgresql, mongodb, redis, none (postgresql - default): ")
+             "postgresql, mysql, mongodb, redis, none (postgresql - default): ")
       @app.should_receive(:databases=).with(["postgresql", "mongodb", "redis"])
       fake_stdin(["", "postgresql  ,mongodb redis"]) do
         invoke(@main, :add)
@@ -411,10 +411,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     it "should ask again for databases if unsupported kind typed" do
       $stdout.should_receive(:print).
         with("Which databases do you want to use " \
-             "postgresql, mongodb, redis, none (postgresql - default): ")
+             "postgresql, mysql, mongodb, redis, none (postgresql - default): ")
       $stdout.should_receive(:print).
         with("Unknown database kind. Supported are: " \
-             "postgresql, mongodb, redis, none: ")
+             "postgresql, mysql, mongodb, redis, none: ")
       fake_stdin(["", "postgresql,doesnt-exist", "none"]) do
         invoke(@main, :add)
       end

data/spec/shelly/cloudfile_spec.rb

@@ -121,6 +121,7 @@ foo-staging:
       databases:
         - postgresql
         - mongodb
+        # - mysql
         # - redis
 config
 
@@ -152,6 +153,7 @@ foo-staging:
       databases:
         - postgresql
         - mongodb
+        # - mysql
         # - redis
 config
         @cloudfile.generate.should == expected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.39
+  version: 0.4.40
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -224,16 +224,16 @@ dependencies:
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.5
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool