intercity 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35afb301302349a658481ccc4791431ff3d042d
-  data.tar.gz: 1c7e5d7ab4cfbfb85a5b5ead6cb581a865958741
+  metadata.gz: edd9295364761e3b543ba8ddc3ae95ea16d23fb9
+  data.tar.gz: 4e1d7f35a1c1f28243a62b661e28c6abca869800
 SHA512:
-  metadata.gz: f93310bb6008f3edc8a27d4fe760c2d6480f120200c884cc7e5c6170f21e5ac8f88808303d46ca920b27c59137caa029341b68d361f65cd044f5d3985585cd30
-  data.tar.gz: 6a605b5a6dbe905730024a76221ee9c3218e2b17d446a0016cbbf1c130b6cb9118b5d1e5a253b6196a25e27e0c0c5594b19242932c6f68d461d03af3a63e5860
+  metadata.gz: a376658d200686a094996b57f5358aea26756f0aff714c4313e0fb77f309768de56fcae01d6c30cb37b4250dac010f20be02b16c44d6ced3dea35135f06ff20a
+  data.tar.gz: 0d92dd4db5739ae0fb0dbad6e27ccad6bdc3e2e8fbca82e4c7fdd9e4b0bfdd4b3dcdd1c3d3dcf8195025addcbf6f403ee90e7da3d0eef4542272a635232f7b19

data/README.md

@@ -46,7 +46,7 @@ $ intercity sshkey add
 You can edit environment variables for your app like this:
 
 ```
-$ intercity application edit intercity
+$ intercity application config intercity
 ```
 
 Finally, set up Capistrano in your app and deploy with:
@@ -88,7 +88,7 @@ $ intercity application create APPNAME
 $ intercity application update APPNAME --domain-name=mysite.com
 
 # Edit environment variables for an application:
-$ intercity application edit APPNAME
+$ intercity application config APPNAME
 
 # List all the applications on the server:
 $ intercity application list

data/intercity.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'intercity'
-  s.version = '0.1.4'
-  s.date = '2015-03-15'
+  s.version = '0.1.5'
+  s.date = '2015-03-18'
   s.summary = 'Command-line interface for hosting Rails apps on your server.'
   s.authors = ['Michiel Sikkes']
   s.email = 'michiel.sikkes@gmail.com'

data/lib/intercity/cli/application.rb

@@ -8,6 +8,9 @@ module IntercityCLI
     map "create" => :add
     map "update" => :add
 
+    map "envvars" => :config
+    map "environment_variables" => :config
+
     desc "list", "Lists all the application deployments on the server"
     option :user, default: "root"
     option :server, type: :string
@@ -24,10 +27,10 @@ module IntercityCLI
       end
     end
 
-    desc "edit APPLICATION", "Edit ENV variables for application"
+    desc "config APPLICATION", "Edit ENV variables for application"
     option :user, default: "root"
     option :server, type: :string
-    def edit(application)
+    def config(application)
       configuration = IntercityCLI::Configuration.new()
       address = options[:server] || configuration.active_server!
       node_file = File.join(configuration.nodes_directory, "#{address}.json")
@@ -54,7 +57,11 @@ module IntercityCLI
       end
 
       file_stamp_before_editing = File.mtime(tmp_filename)
-      response = system("$EDITOR #{tmp_filename}")
+
+      editor = ENV["EDITOR"] || find_editor("editor") || find_editor("nano")
+
+      edit_command = "#{editor} #{tmp_filename}"
+      response = system(edit_command)
 
       if file_stamp_before_editing != File.mtime(tmp_filename)
         new_vars = {}
@@ -153,5 +160,12 @@ module IntercityCLI
         end
       end
     end
+
+    private
+
+    def find_editor(editor_name)
+      editor_command = `which #{editor_name}`
+      return editor_command.chomp if editor_command != ""
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercity
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Michiel Sikkes
@@ -30,7 +30,7 @@ cert_chain:
   +MPuiRlaQjfZy/soMMERP/wuGpw6Ce94ITJ56wjQgl3YhqQPoE76KgRu4b4YwKhx
   H7APPQD4vksmpWYDCN7llFs/nPaYM6lkxy7bcHRQxaA/km9IF+0iwbhv9mDdDQ==
   -----END CERTIFICATE-----
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor