shelly 0.0.34 → 0.0.36

data/lib/shelly/app.rb

@@ -115,20 +115,20 @@ module Shelly
       configs.find_all { |config| config["created_by_user"] == false }
     end
 
-    def config(id)
-      shelly.app_config(code_name, id)
+    def config(path)
+      shelly.app_config(code_name, path)
     end
 
     def create_config(path, content)
       shelly.app_create_config(code_name, path, content)
     end
 
-    def update_config(id, content)
-      shelly.app_update_config(code_name, id, content)
+    def update_config(path, content)
+      shelly.app_update_config(code_name, path, content)
     end
 
-    def delete_config(id)
-      shelly.app_delete_config(code_name, id)
+    def delete_config(path)
+      shelly.app_delete_config(code_name, path)
     end
 
     def open_billing_page

data/lib/shelly/cli/config.rb

@@ -44,15 +44,19 @@ module Shelly
 
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to show configuration file for"
-      desc "show CONFIG_ID", "View configuration file"
-      def show(id = nil)
+      desc "show PATH", "View configuration file"
+      def show(path = nil)
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        say_error "No configuration file specified" unless id
-        multiple_clouds(options[:cloud], "show #{id}", "Specify cloud using:")
-        config = @app.config(id)
+        say_error "No configuration file specified" unless path
+        multiple_clouds(options[:cloud], "show #{path}", "Specify cloud using:")
+        config = @app.config(path)
         say "Content of #{config["path"]}:", :green
         say config["content"]
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        end
       end
 
       map "new" => :create
@@ -81,15 +85,15 @@ module Shelly
       map "update" => :edit
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify for which cloud edit configuration file"
-      desc "edit CONFIG_ID", "Edit configuration file"
-      def edit(id = nil)
+      desc "edit PATH", "Edit configuration file"
+      def edit(path = nil)
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        say_error "No configuration file specified" unless id
-        multiple_clouds(options[:cloud], "edit #{id}", "Specify cloud using:")
-        config = @app.config(id)
+        say_error "No configuration file specified" unless path
+        multiple_clouds(options[:cloud], "edit #{path}", "Specify cloud using:")
+        config = @app.config(path)
         content = open_editor(config["path"], config["content"])
-        @app.update_config(id, content)
+        @app.update_config(path, content)
         say "File '#{config["path"]}' updated, it will be used after next code deploy", :green
       rescue Client::APIError => e
         if e.unauthorized?
@@ -104,16 +108,15 @@ module Shelly
 
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify for which cloud delete configuration file"
-      desc "delete CONFIG_ID", "Delete configuration file"
-      def delete(id = nil)
+      desc "delete PATH", "Delete configuration file"
+      def delete(path = nil)
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        say_error "No configuration file specified" unless id
-        multiple_clouds(options[:cloud], "delete #{id}", "Specify cloud using:")
-        config = @app.config(id)
-        answer = ask("Are you sure you want to delete '#{config["path"]}' [y/n]: ")
+        say_error "No configuration file specified" unless path
+        multiple_clouds(options[:cloud], "delete #{path}", "Specify cloud using:")
+        answer = ask("Are you sure you want to delete 'path' [y/n]: ")
         if answer =~ /yes|YES|y|Y/
-          @app.delete_config(id)
+          @app.delete_config(path)
           say "File deleted, redeploy your cloud to make changes", :green
         else
           say "File not deleted"
@@ -132,7 +135,7 @@ module Shelly
       no_tasks do
         def print_configs(configs)
           print_table(configs.map { |config|
-            [" * ", config["id"], config["path"]] })
+            [" * ", config["path"]] })
         end
 
         def open_editor(path, output = "")

data/lib/shelly/client.rb

@@ -1,5 +1,6 @@
 require "rest_client"
 require "json"
+require "cgi"
 
 module Shelly
   class Client
@@ -71,20 +72,20 @@ module Shelly
       get("/apps/#{cloud}/configs")
     end
 
-    def app_config(cloud, id)
-      get("/apps/#{cloud}/configs/#{id}")
+    def app_config(cloud, path)
+      get("/apps/#{cloud}/configs/#{CGI.escape(path)}")
     end
 
     def app_create_config(cloud, path, content)
       post("/apps/#{cloud}/configs", :config => {:path => path, :content => content})
     end
 
-    def app_update_config(cloud, id, content)
-      put("/apps/#{cloud}/configs/#{id}", :config => {:content => content})
+    def app_update_config(cloud, path, content)
+      put("/apps/#{cloud}/configs/#{CGI.escape(path)}", :config => {:content => content})
     end
 
-    def app_delete_config(cloud, id)
-      delete("/apps/#{cloud}/configs/#{id}")
+    def app_delete_config(cloud, path)
+      delete("/apps/#{cloud}/configs/#{CGI.escape(path)}")
     end
 
     def send_invitation(cloud, email)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.34"
+  VERSION = "0.0.36"
 end

data/spec/shelly/cli/config_spec.rb

@@ -41,15 +41,15 @@ describe Shelly::CLI::Config do
     end
 
     it "should list available configuration files for clouds" do
-      @client.should_receive(:app_configs).with("foo-staging").and_return([{"id" => 1, "created_by_user" => true, "path" => "config/settings.yml"}])
-      @client.should_receive(:app_configs).with("foo-production").and_return([{"id" => 2, "created_by_user" => false, "path" => "config/app.yml"}])
+      @client.should_receive(:app_configs).with("foo-staging").and_return([{"created_by_user" => true, "path" => "config/settings.yml"}])
+      @client.should_receive(:app_configs).with("foo-production").and_return([{"created_by_user" => false, "path" => "config/app.yml"}])
       $stdout.should_receive(:puts).with(green "Configuration files for foo-production")
       $stdout.should_receive(:puts).with("You have no custom configuration files.")
       $stdout.should_receive(:puts).with("Following files are created by Shelly Cloud:")
-      $stdout.should_receive(:puts).with(/ * 2\s+config\/app.yml/)
+      $stdout.should_receive(:puts).with(/ * \s+config\/app.yml/)
       $stdout.should_receive(:puts).with(green "Configuration files for foo-staging")
       $stdout.should_receive(:puts).with("Custom configuration files:")
-      $stdout.should_receive(:puts).with(/ * 1\s+config\/settings.yml/)
+      $stdout.should_receive(:puts).with(/ * \s+config\/settings.yml/)
 
       @config.list
     end
@@ -200,7 +200,6 @@ describe Shelly::CLI::Config do
     end
 
     it "should delete configuration file" do
-      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
       @client.should_receive(:app_delete_config).with("foo-staging", 1).and_return({})
       $stdout.should_receive(:puts).with(green "File deleted, redeploy your cloud to make changes")
       fake_stdin(["y"]) do
@@ -209,7 +208,6 @@ describe Shelly::CLI::Config do
     end
 
     it "should not delete file if user answered other than yes/y" do
-      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
       @client.should_not_receive(:app_delete_config)
       $stdout.should_receive(:puts).with("File not deleted")
       fake_stdin(["n"]) do
@@ -228,7 +226,6 @@ describe Shelly::CLI::Config do
       end
 
       it "should use cloud specified by parameter" do
-        @client.should_receive(:app_config).with("foo-production", 1).and_return({"path" => "test.rb", "content" => "example content"})
         @client.should_receive(:app_delete_config).with("foo-production", 1).and_return({})
         $stdout.should_receive(:puts).with(green "File deleted, redeploy your cloud to make changes")
         @config.options = {:cloud => "foo-production"}

metadata

@@ -1,216 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 91
+version: !ruby/object:Gem::Version
+  version: 0.0.36
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 34
-  version: 0.0.34
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70232388827320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388827320
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70232388826900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388826900
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70232388826480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388826480
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70232388826060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: growl_notify
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388826060
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &70232388825540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388825540
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70232388825120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388825120
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70232388824600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388824600
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70232388824140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: wijet-thor
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388824140
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
+  requirement: &70232388823400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 14
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.14.7
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388823400
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70232388821260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388821260
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70232388820800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: wijet-launchy
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388820800
+- !ruby/object:Gem::Dependency
+  name: wijet-launchy
+  requirement: &70232388820380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: progressbar
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70232388820380
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: &70232388808000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id013
+  prerelease: false
+  version_requirements: *70232388808000
 description: Tool for managing applications and clouds at shellycloud.com
-email: 
+email:
 - support@shellycloud.com
-executables: 
+executables:
 - shelly
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -261,38 +212,29 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: 
+test_files:
 - spec/helpers.rb
 - spec/input_faker.rb
 - spec/shelly/app_spec.rb