intercity 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e4cb14857b488f4fa9b273892debcc5fd189c7
-  data.tar.gz: 732ddd745efc949198da1663c003e6ae081950ec
+  metadata.gz: d35afb301302349a658481ccc4791431ff3d042d
+  data.tar.gz: 1c7e5d7ab4cfbfb85a5b5ead6cb581a865958741
 SHA512:
-  metadata.gz: 8883ba153a41414ff4617a16184f23a0c80fceafbd35889c828ebb3a3ef0107f6438979e85e3b67521ec5ece5542f8752e48c39c4eff85f9401664341d5428bf
-  data.tar.gz: 48610b447767312fade43c6e5723e0f7f17507af06f3716561e23c8edf0dd1ffd6b300b873d75e5a21a1dc42aab91c48ea4fa7c0e49c1cec7f62dabf20660653
+  metadata.gz: f93310bb6008f3edc8a27d4fe760c2d6480f120200c884cc7e5c6170f21e5ac8f88808303d46ca920b27c59137caa029341b68d361f65cd044f5d3985585cd30
+  data.tar.gz: 6a605b5a6dbe905730024a76221ee9c3218e2b17d446a0016cbbf1c130b6cb9118b5d1e5a253b6196a25e27e0c0c5594b19242932c6f68d461d03af3a63e5860

data/README.md

@@ -13,23 +13,40 @@ $ gem install intercity
 Usage
 -----
 
-Install a clean Ubuntu server and add MySQL:
+Get a clean Ubuntu 14.04 LTS server and initialize it:
 
 ```
 $ intercity server install IPADDRESS
-$ intercity mysql install --server=IPADDRESS
 ```
 
-Then create an application on your server:
+Then install a database server. You can choose PostgreSQL or MySQL:
 
 ```
-$ intercity application create intercity --server=IPADDRESS --domain-name=myapp.com
+$ intercity postgresql install
+```
+
+or
+
+```
+$ intercity mysql install
+```
+
+Now, create an application on your server:
+
+```
+$ intercity application create myapp
+```
+
+Upload your SSH key to the server so you can deploy the app with Capistrano:
+
+```
+$ intercity sshkey add
 ```
 
 You can edit environment variables for your app like this:
 
 ```
-$ intercity application edit intercity --server=IPADDRESS # Edit ENV vars
+$ intercity application edit intercity
 ```
 
 Finally, set up Capistrano in your app and deploy with:
@@ -43,13 +60,36 @@ All commands
 ------------
 
 ```
-$ intercity server install IPADDRESS
+# Initialize a server:
+$ intercity server install HOST/IP
+
+# List all your servers:
+$ intercity server list
+
+# Switch the active server:
+$ intercity switch HOST/IP
+
+# Install PostgreSQL:
+$ intercity postgresql install
+
+# Install MySQL:
+$ intercity mysql install
+
+# List your MySQL databases:
+$ intercity mysql list
+
+# Add your SSH key for deployment:
+$ intercity sshkey add
+
+# Create an application on your server:
+$ intercity application create APPNAME
+
+# Update an application setting, for example the domain names:
+$ intercity application update APPNAME --domain-name=mysite.com
 
-$ intercity mysql list --server=IPADDRESS
-$ intercity mysql install --server=IPADDRESS
+# Edit environment variables for an application:
+$ intercity application edit APPNAME
 
-$ intercity application add APPNAME --server=IPADDRESS --domain-name=myapp.com
-$ intercity application update APPNAME --server=IPADDRESS --domain-name=myapp.com
-$ intercity application edit APPNAME --server=IPADDRESS # For editing the ENV vars
-$ intercity application list --server=IPADDRESS
+# 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.3'
-  s.date = '2015-01-24'
+  s.version = '0.1.4'
+  s.date = '2015-03-15'
   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

@@ -10,11 +10,11 @@ module IntercityCLI
 
     desc "list", "Lists all the application deployments on the server"
     option :user, default: "root"
-    option :server, type: :string, required: true
+    option :server, type: :string
     def list()
       configuration = IntercityCLI::Configuration.new()
 
-      server = options[:server]
+      server = options[:server] || configuration.active_server!
       user = options[:user]
       on server do |host|
         host.user = user
@@ -26,12 +26,11 @@ module IntercityCLI
 
     desc "edit APPLICATION", "Edit ENV variables for application"
     option :user, default: "root"
-    option :server, type: :string, required: true
+    option :server, type: :string
     def edit(application)
-      address = options[:server]
-
       configuration = IntercityCLI::Configuration.new()
-      node_file = File.join(configuration.config_directory, "#{address}.json")
+      address = options[:server] || configuration.active_server!
+      node_file = File.join(configuration.nodes_directory, "#{address}.json")
 
       user = options[:user]
 
@@ -82,7 +81,7 @@ module IntercityCLI
 
             upload! node_file , "/root/server_config.json"
 
-            execute 'chef-client -z -j ~/server_config.json -o "recipe[rails::env_vars]"'
+            execute 'chef-solo -c solo.rb -j ~/server_config.json -o "recipe[rails::env_vars]"'
           end
         end
       else
@@ -92,20 +91,21 @@ module IntercityCLI
 
     desc "add APPLICATION", "Adds an application to a server"
     option :user, default: "root"
-    option :server, type: :string, required: true
-    option :domain_name, type: :string, required: true
+    option :server, type: :string
+    option :domain_name, type: :string
     option :rails_environment, type: :string, default: "production"
-    option :database_adapter, type: :string, default: "mysql2"
+    option :database_adapter, type: :string, default: "postgresql"
     option :database_name, type: :string, default: SecureRandom.hex(6)
     option :database_user, type: :string, default: SecureRandom.hex(6)
     option :database_password, type: :string, default: SecureRandom.hex()
-    option :database_host, type: :string, default: "127.0.0.1"
+    option :database_host, type: :string, default: "localhost"
     option :ruby_version, type: :string, default: "2.1.3"
     def add(application)
-      address = options[:server]
-
       configuration = IntercityCLI::Configuration.new()
-      node_file = File.join(configuration.config_directory, "#{address}.json")
+
+      address = options[:server] || configuration.active_server!
+
+      node_file = File.join(configuration.nodes_directory, "#{address}.json")
 
       if File.exists?(node_file)
         raw_json = File.read(node_file)
@@ -114,13 +114,16 @@ module IntercityCLI
         raise "No configuration file for this server yet! Please create one by running:\n\n$ intercity server install <ip address>\n\n"
       end
 
+      json["nginx"] ||= {}
+      json["nginx"]["package_name"] = "nginx-extras"
+
       json["active_applications"] ||= {}
 
       json["active_applications"][application] ||= {}
 
       json["active_applications"][application].merge!(
         {
-          "domain_names" => [options[:domain_name]],
+          "domain_names" => [options[:domain_name] || address],
           "rails_env" => options[:rails_environment],
           "database_info" => {
             "adapter" => options[:database_adapter],
@@ -129,7 +132,8 @@ module IntercityCLI
             "password" => options[:database_password],
             "database" => options[:database_name]
           },
-          "ruby_version" => options[:ruby_version]
+          "ruby_version" => options[:ruby_version],
+          "packages" => ["nodejs", "imagemagick"]
         }
       )
 
@@ -145,7 +149,7 @@ module IntercityCLI
 
           upload! node_file, "/root/server_config.json"
 
-          execute 'chef-client -z -j ~/server_config.json -o "recipe[rails::passenger],recipe[rails::databases]"'
+          execute 'chef-solo -c solo.rb -j ~/server_config.json -o "recipe[apt],recipe[rails::passenger],recipe[rails::databases]"'
         end
       end
     end

data/lib/intercity/cli/mysql.rb

@@ -10,10 +10,10 @@ module IntercityCLI
     option :user, default: "root"
     option :server, type: :string, required: true
     def list
-      address = options[:server]
-
       configuration = IntercityCLI::Configuration.new()
-      node_file = File.join(configuration.config_directory, "#{address}.json")
+      address = options[:server] || configuration.active_server!
+
+      node_file = File.join(configuration.nodes_directory, "#{address}.json")
 
       raw_json = File.read(node_file)
       json = JSON.parse(raw_json)
@@ -45,9 +45,12 @@ module IntercityCLI
     desc "install IPADDRESS", "Installs MySQL at IPADDRESS"
     option :user, default: "root"
     option :root_password, default: SecureRandom.hex(), type: :string
-    def install(address)
+    option :server, required: true, type: :string
+    def install
       configuration = IntercityCLI::Configuration.new()
-      node_file = File.join(configuration.config_directory, "#{address}.json")
+      address = options[:server] || configuration.active_server!
+
+      node_file = File.join(configuration.nodes_directory, "#{address}.json")
 
       if File.exists?(node_file)
         raw_json = File.read(node_file)
@@ -70,7 +73,7 @@ module IntercityCLI
 
           upload! node_file, "/root/server_config.json"
 
-          execute 'chef-client -z -j ~/server_config.json -o recipe[mysql::server]'
+          execute 'chef-solo -c solo.rb -j ~/server_config.json -o recipe[mysql::server]'
         end
       end
     end

data/lib/intercity/cli/postgresql.rb

@@ -0,0 +1,45 @@
+require "thor"
+require "json"
+require "sshkit"
+
+module IntercityCLI
+  class PostgreSQL < Thor
+    require "sshkit/dsl"
+
+    desc "install IPADDRESS", "Installs MySQL at IPADDRESS"
+    option :user, default: "root"
+    option :root_password, default: SecureRandom.hex(), type: :string
+    option :server, type: :string
+    def install
+      configuration = IntercityCLI::Configuration.new()
+      address = options[:server] || configuration.active_server!
+
+      node_file = File.join(configuration.nodes_directory, "#{address}.json")
+
+      if File.exists?(node_file)
+        raw_json = File.read(node_file)
+        json = JSON.parse(raw_json)
+      else
+        json = {postgresql: {
+          password: { postgres: options[:root_password] }
+          }}
+      end
+
+      File.open(node_file, "w+") do |f|
+        f.write(JSON.pretty_generate(json))
+      end
+
+      server = address
+      user = options[:user]
+      on server do |host|
+        with debian_frontend:  :noninteractive do
+          host.user = user
+
+          upload! node_file, "/root/server_config.json"
+
+          execute 'chef-solo -c solo.rb -j ~/server_config.json -o recipe[postgresql::server]'
+        end
+      end
+    end
+  end
+end

data/lib/intercity/cli/server.rb

@@ -5,9 +5,26 @@ module IntercityCLI
   class Server < Thor
     require "sshkit/dsl"
 
+    desc "list", "Lists your servers"
+    def list()
+      configuration = IntercityCLI::Configuration.new()
+      Dir.chdir(configuration.nodes_directory) do
+        Dir["*.json"].each do |server_config|
+          server_name = server_config.gsub(".json", "")
+          if server_name == configuration.active_server
+            puts "* #{server_name}"
+          else
+            puts server_name
+          end
+        end
+      end
+    end
+
     desc "install IPADDRESS", "Installs server at IPADDRESS"
     option :user, type: :string, default: "root"
     def install(address)
+      configuration = IntercityCLI::Configuration.new()
+
       server = address
       user = options[:user]
       on server do |host|
@@ -20,12 +37,21 @@ module IntercityCLI
           execute "curl -L https://www.chef.io/chef/install.sh | sudo bash"
 
           # Install chef-repo
-          execute "wget http://binaries.intercityup.com/cookbooks/cookbooks-2.3.0.tar.gz?client=cli -O cookbooks-2.3.0.tar.gz"
-          execute "tar zxf cookbooks-2.3.0.tar.gz"
+          execute "wget http://binaries.intercityup.com/cookbooks/cookbooks-2.3.1.tar.gz?client=cli -O cookbooks-2.3.1.tar.gz"
+          execute "tar zxf cookbooks-2.3.1.tar.gz"
+
+          solo_config = StringIO.new('cookbook_path ["/root/cookbooks"]')
+          upload! solo_config, "/root/solo.rb"
 
-          execute "chef-client -z"
+          execute "chef-solo -c solo.rb"
         end
       end
+
+      configuration.active_server = address
+      puts
+      puts "Badam. Server #{address} initialized."
+      puts "This server will be used for subsequent commands."
+      puts "You can switch to a different server with \"intercity switch\"."
     end
   end
 end

data/lib/intercity/cli/ssh_key.rb

@@ -0,0 +1,53 @@
+require "thor"
+require "sshkit"
+
+module IntercityCLI
+  class SSHKey < Thor
+    require "sshkit/dsl"
+
+    desc "add", "Adds your workstation SSH key for deployment"
+    option :user, default: "root"
+    option :server, type: :string
+    option :ssh_public_key_path, type: :string, default: "~/.ssh/id_rsa.pub"
+    def add()
+      configuration = IntercityCLI::Configuration.new()
+      address = options[:server] || configuration.active_server!
+
+      node_file = File.join(configuration.nodes_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"
+      end
+
+      ssh_key_path = File.expand_path(options[:ssh_public_key_path])
+      if !File.exists?(ssh_key_path)
+        raise "You don't have an SSH key yet. Generate one with ssh-keygen"
+      end
+
+      json["deploy_users"] ||= []
+      json["deploy_users"] << "deploy"
+      json["deploy_users"].uniq!
+
+      json["ssh_deploy_keys"] ||= []
+      json["ssh_deploy_keys"] << File.read(ssh_key_path)
+      json["ssh_deploy_keys"].uniq!
+
+      File.open(node_file, "w+") do |f|
+        f.write(JSON.pretty_generate(json))
+      end
+
+      server = address
+      user = options[:user]
+      on server do |host|
+        host.user = user
+
+        upload! node_file, "/root/server_config.json"
+
+        execute 'chef-solo -c solo.rb -j ~/server_config.json -o "recipe[ssh_deploy_keys]"'
+      end
+    end
+  end
+end

data/lib/intercity/cli.rb

@@ -1,7 +1,11 @@
 require "thor"
 require "intercity/cli/server"
 require "intercity/cli/mysql"
+require "intercity/cli/postgresql"
 require "intercity/cli/application"
+require "intercity/cli/ssh_key"
+
+require "fileutils"
 
 module IntercityCLI
 
@@ -14,19 +18,74 @@ module IntercityCLI
     desc "mysql SUBCOMMAND ARGS", "subcommands to manage mysql"
     subcommand "mysql", MySQL
 
+    desc "postgresql SUBCOMMAND ARGS", "subcommands to manage postgresql"
+    subcommand "postgresql", PostgreSQL
+
     desc "application SUBCOMMAND ARGS", "subcommands to manage applications"
     subcommand "application", Application
+
+    desc "sshkey SUBCOMMAND ARGS", "subcommand to manage SSH keys"
+    subcommand "sshkey", SSHKey
+
+    desc "switch SERVER", "switches Intercity CLI over to SERVER so you don't have to set --server"
+    def switch(server)
+      configuration = IntercityCLI::Configuration.new()
+      configuration.active_server = server
+      puts "Switched active server to #{server}"
+    end
+
+    desc "active", "Shows you which server is active for Intercity CLI"
+    def active
+      configuration = IntercityCLI::Configuration.new()
+      puts configuration.active_server
+    end
   end
 
   class Configuration
     def initialize()
-      if !Dir.exists?("nodes")
-        Dir.mkdir("nodes")
+      if !Dir.exists?(config_directory)
+        FileUtils.mkdir_p(nodes_directory)
+      end
+
+      if !Dir.exists?(config_directory)
+        FileUtils.mkdir_p(nodes_directory)
       end
     end
 
     def config_directory
-      File.expand_path("nodes")
+      File.expand_path("~/.intercity")
+    end
+
+    def nodes_directory
+      File.expand_path("~/.intercity/nodes")
+    end
+
+    def active_server
+      if !@active_server
+        current_server_path = File.expand_path("~/.intercity/active_server")
+        if File.exists?(current_server_path)
+          @active_server = File.open(current_server_path, "r") do |f|
+            f.read
+          end
+        end
+      end
+      return @active_server
+    end
+
+    def active_server!
+      if !active_server
+        puts 'No active server yet. Use the "switch" command or pass a server with --server'
+        exist
+      else
+        return active_server
+      end
+    end
+
+    def active_server=(server)
+      current_server_path = File.expand_path("~/.intercity/active_server")
+      File.open(current_server_path, "w+") do |f|
+        f.write(server)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercity
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Michiel Sikkes
@@ -30,7 +30,7 @@ cert_chain:
   +MPuiRlaQjfZy/soMMERP/wuGpw6Ce94ITJ56wjQgl3YhqQPoE76KgRu4b4YwKhx
   H7APPQD4vksmpWYDCN7llFs/nPaYM6lkxy7bcHRQxaA/km9IF+0iwbhv9mDdDQ==
   -----END CERTIFICATE-----
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,7 +75,9 @@ files:
 - lib/intercity/cli.rb
 - lib/intercity/cli/application.rb
 - lib/intercity/cli/mysql.rb
+- lib/intercity/cli/postgresql.rb
 - lib/intercity/cli/server.rb
+- lib/intercity/cli/ssh_key.rb
 homepage: https://intercityup.com
 licenses:
 - MIT