intercity 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 839bbcd9b7b4c37fe2852417b04b78c93a2bf494
-  data.tar.gz: 92f8944544dd5be756d7c6cf6e6c5577ce366b1f
+  metadata.gz: b9e4cb14857b488f4fa9b273892debcc5fd189c7
+  data.tar.gz: 732ddd745efc949198da1663c003e6ae081950ec
 SHA512:
-  metadata.gz: e2b7e09ee366fd2f8d65d0b3ec80fbbb337525754d05ba7bf9061559b2f29888a2844b45f8103baee126768a539826972a7be562eea88a1bb0eb021d69ca1513
-  data.tar.gz: 7254762f6105434bb52b41a764054ace20c8816f72a926ba9ca74dd20c1212ba8b285f27e882eb3f60b385bfd803b3b33f977e1254a560b182b27ead786db373
+  metadata.gz: 8883ba153a41414ff4617a16184f23a0c80fceafbd35889c828ebb3a3ef0107f6438979e85e3b67521ec5ece5542f8752e48c39c4eff85f9401664341d5428bf
+  data.tar.gz: 48610b447767312fade43c6e5723e0f7f17507af06f3716561e23c8edf0dd1ffd6b300b873d75e5a21a1dc42aab91c48ea4fa7c0e49c1cec7f62dabf20660653

data/intercity.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'intercity'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.date = '2015-01-24'
   s.summary = 'Command-line interface for hosting Rails apps on your server.'
   s.authors = ['Michiel Sikkes']

data/lib/intercity/cli/application.rb

@@ -103,8 +103,12 @@ module IntercityCLI
     option :ruby_version, type: :string, default: "2.1.3"
     def add(application)
       address = options[:server]
-      if File.exists?("#{address}.json")
-        raw_json = File.read("#{address}.json")
+
+      configuration = IntercityCLI::Configuration.new()
+      node_file = File.join(configuration.config_directory, "#{address}.json")
+
+      if File.exists?(node_file)
+        raw_json = File.read(node_file)
         json = JSON.parse(raw_json)
       else
         raise "No configuration file for this server yet! Please create one by running:\n\n$ intercity server install <ip address>\n\n"
@@ -129,7 +133,7 @@ module IntercityCLI
         }
       )
 
-      File.open("#{address}.json", "w") do |f|
+      File.open(node_file, "w+") do |f|
         f.write(JSON.pretty_generate(json))
       end
 
@@ -139,7 +143,7 @@ module IntercityCLI
         with debian_frontend:  :noninteractive do
           host.user = user
 
-          upload! "#{address}.json", "/root/server_config.json"
+          upload! node_file, "/root/server_config.json"
 
           execute 'chef-client -z -j ~/server_config.json -o "recipe[rails::passenger],recipe[rails::databases]"'
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercity
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michiel Sikkes