peas-cli 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620734d8a5713490dbf9b4f79a669ebba23f0147
-  data.tar.gz: f758e5a9bcf974c88c15a48f26839d6bcdd295fe
+  metadata.gz: ce1aa06662fc854dd4a33701bc818feb65fbb628
+  data.tar.gz: 7b31388468f79007654454249a62048977af84d8
 SHA512:
-  metadata.gz: 7fa88458e995231523a05e1c9746956cf84f95901e515514c85478e9c63915bf080e6627f4b5b752e46341ddf93713b8a7864c7b0160d7bc1372d31b5ebeaedc
-  data.tar.gz: 33395d9b38d39c016a244010e537e6eafaadce6084e5cd990920128e6aef47c4f9ee165d9100a221f1c343287f4a3f53099b870e30e205e4c074bb73a83d464c
+  metadata.gz: f8b5831ae013078332b0ec19d28d829b16936108d8b929b5082f2be7a1dcd1480a27b86abf6f2438c1afb6da26d867c431ed5d0a86a8b5f63d00f47764254b16
+  data.tar.gz: 4ebd57e18fcc038e098d26e36bc6fbc189f15df0093fa77b3958af764e4b7296929f6656213ac0d24102356b7aac602ed7e2d1642d605b9d7103ead0bf26ff9e

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'gli'
 gem 'httparty'
 gem 'rainbow'
+gem 'addressable'
 
 group :test do
   gem 'rspec'

data/Gemfile.lock

@@ -75,6 +75,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable
   gli
   httparty
   jeweler

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/peas/api.rb

@@ -48,6 +48,7 @@ class API
       else
         puts json['message']
       end
+      json
     end
   end
 

data/lib/peas/commands/app.rb

@@ -7,12 +7,21 @@ end
 
 desc 'Create an app'
 command :create do |c|
+  public_key_path = "#{ENV['HOME']}/.ssh/id_rsa.pub"
   c.action do |_global_options, _options, _args|
-    @api.request(
+    unless Git.remote('peas').empty?
+      exit_now! "This repo already has an app (#{Git.name_from_remote}) associated with it.", 1
+    end
+    unless File.exist? public_key_path
+      exit_now! "Couldn't find an SSH public key", 1
+    end
+    response = @api.request(
       :post,
-      "/app/#{Git.first_sha}",
-      remote: Git.remote
+      '/app',
+      muse: Git.name_from_remote(Git.remote('origin')),
+      public_key: File.open(public_key_path).read
     )
+    Git.add_remote response['remote_uri']
   end
 end
 
@@ -21,15 +30,9 @@ command :destroy do |c|
   c.action do |_global_options, _options, _args|
     @api.request(
       :delete,
-      "/app/#{Git.first_sha}"
+      "/app/#{Git.name_from_remote}"
     )
-  end
-end
-
-desc 'Deploy an app'
-command :deploy do |c|
-  c.action do |_global_options, _options, _args|
-    @api.request :get, "/app/#{Git.first_sha}/deploy"
+    Git.remove_remote
   end
 end
 
@@ -40,7 +43,7 @@ EOF
 command :scale do |c|
   c.action do |_global_options, _options, args|
     if args.length == 0
-      exit_now! "Please provide scaling arguments in the form: web=3 worker=2"
+      exit_now! "Please provide scaling arguments in the form: web=3 worker=2", 1
     end
     scaling_hash = {}
     args.each do |arg|
@@ -51,7 +54,7 @@ command :scale do |c|
     end
     @api.request(
       :put,
-      "/app/#{Git.first_sha}/scale",
+      "/app/#{Git.name_from_remote}/scale",
       scaling_hash: scaling_hash.to_json
     )
   end

data/lib/peas/commands/config.rb

@@ -2,15 +2,17 @@ desc 'Add, remove and list config for an app'
 command :config do |c|
   c.default_desc 'List all config'
   c.action do |_global_options, _options, _args|
-    @api.request :get, "/app/#{Git.first_sha}/config"
+    @api.request :get, "/app/#{Git.name_from_remote}/config"
   end
 
   c.desc 'Delete config by keys'
   c.command :rm do |sc|
     sc.action do |_global_options, _options, args|
-      @api.request :delete, "/app/#{Git.first_sha}/config",
-                   keys: args.to_json
-
+      @api.request(
+        :delete,
+        "/app/#{Git.name_from_remote}/config",
+        keys: args.to_json
+      )
     end
   end
 
@@ -27,9 +29,11 @@ command :config do |c|
         value = parts[1]
         vars[key] = value
       end
-      @api.request :put, "/app/#{Git.first_sha}/config",
-                   vars: vars.to_json
-
+      @api.request(
+        :put,
+        "/app/#{Git.name_from_remote}/config",
+        vars: vars.to_json
+      )
     end
   end
 end

data/lib/peas/commands/logs.rb

@@ -1,6 +1,11 @@
 desc 'Show logs for an app'
 command :logs do |c|
-  c.action do |_global_options, _options, _args|
-    API.stream_output "stream_logs.#{Git.first_sha}"
+
+  c.desc "Follow logs as new lines are created"
+  c.switch [:f, :follow]
+
+  c.action do |_global_options, options, _args|
+    follow = options[:follow] ? 'follow' : ''
+    API.stream_output "stream_logs.#{Git.name_from_remote} #{follow}"
   end
 end

data/lib/peas/git.rb

@@ -1,3 +1,5 @@
+require "addressable/uri"
+
 class Git
   def self.sh(cmd)
     `#{cmd}`.strip
@@ -7,11 +9,22 @@ class Git
     sh 'git rev-parse --show-toplevel'
   end
 
-  def self.remote
-    sh 'git config --get remote.origin.url'
+  def self.remote(remote = 'peas')
+    sh "git config --get remote.#{remote}.url"
+  end
+
+  def self.add_remote(remote)
+    sh "git remote add peas #{remote}"
+  end
+
+  def self.remove_remote(remote = 'peas')
+    sh "git remote rm #{remote}"
   end
 
-  def self.first_sha
-    sh 'git rev-list --max-parents=0 HEAD | head -n1'
+  def self.name_from_remote(remote_uri = nil)
+    remote_uri = remote unless remote_uri
+    exit_now! "No Peas remote. I can't figure out what app this is.", 1 if remote_uri == ''
+    parts = Addressable::URI.parse remote_uri
+    parts.path.split('/').last.gsub('.git', '')
   end
 end

data/peas-cli.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: peas-cli 0.2.1 ruby lib
+# stub: peas-cli 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tom Buckley-Houston"]
-  s.date = "2014-08-01"
+  s.date = "2014-08-23"
   s.description = "Peas is an open source Heroku-style PaaS written in Ruby and using Docker"
   s.email = "tom@tombh.co.uk"
   s.executables = ["peas"]
@@ -51,17 +51,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<gli>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<rainbow>, [">= 0"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<gli>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<rainbow>, [">= 0"])
+      s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<gli>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<rainbow>, [">= 0"])
+    s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/spec/cli_spec.rb

@@ -3,13 +3,19 @@ require 'spec_helper'
 describe 'Peas CLI' do
   before :each do
     allow(Git).to receive(:sh).and_return(nil)
-    allow(Git).to receive(:remote).and_return('git@github.com:test/test.git')
-    allow(Git).to receive(:first_sha).and_return('fakesha')
+    allow(Git).to receive(:remote).and_return('git@github.com:test-test.git')
     allow_any_instance_of(API).to receive(:sleep).and_return(nil)
     allow(Peas).to receive(:config_file).and_return('/tmp/.peas')
     File.delete '/tmp/.peas' if File.exist? '/tmp/.peas'
   end
 
+  describe 'App name' do
+    it 'should get the app name from a remote URI' do
+      allow(Git).to receive(:remote).and_return('git@github.com:tombh-peas.git')
+      expect(Git.name_from_remote).to eq 'tombh-peas'
+    end
+  end
+
   describe 'Settings' do
     it 'should set and use the domain setting' do
       stub_request(:put, 'http://new-domain.com:4000/admin/settings?peas.domain=new-domain.com:4000')
@@ -43,36 +49,38 @@ describe 'Peas CLI' do
       expect(output).to eq "coolapp\n"
     end
 
-    it 'should create an app' do
-      stub_request(:post, TEST_DOMAIN + '/app/fakesha?remote=git@github.com:test/test.git')
-        .to_return(body: response_mock("App 'test' successfully created"))
+    it 'should create an app and its remote' do
+      public_key_path = "#{ENV['HOME']}/.ssh/id_rsa.pub"
+      allow(File).to receive(:open).and_call_original
+      expect(File).to receive(:exist?).with(public_key_path) { true }
+      expect(File).to receive(:open).with(public_key_path) { double(read: 'apublickey') }
+      stub_request(:post, TEST_DOMAIN + '/app?muse=test-test&public_key=apublickey')
+        .to_return(
+          body: {
+            version: Peas::VERSION,
+            message: "App 'test-test' successfully created",
+            remote_uri: 'git@peas.io:test-test.git'
+          }.to_json
+        )
+      allow(Git).to receive(:remote).with('peas').and_return('')
+      allow(Git).to receive(:remote).with('origin').and_return('git@github.com:test-test.git')
+      expect(Git).to receive(:add_remote).with('git@peas.io:test-test.git')
       output = cli ['create']
-      expect(output).to eq "App 'test' successfully created\n"
+      expect(output).to eq "App 'test-test' successfully created\n"
     end
 
     it 'should destroy an app' do
-      stub_request(:delete, TEST_DOMAIN + '/app/fakesha')
+      stub_request(:delete, TEST_DOMAIN + '/app/test-test')
         .to_return(body: response_mock("App 'test' successfully destroyed"))
+      expect(Git).to receive(:remove_remote)
       output = cli ['destroy']
       expect(output).to eq "App 'test' successfully destroyed\n"
     end
 
-    it 'should deploy an app', :with_socket do
-      stub_request(:get, /deploy/).to_return(body: '{"job": "123"}')
-      allow(@socket).to receive(:gets).and_return(
-        '{"body":"doing"}',
-        '{"body":"something"}',
-        '{"body":"done"}',
-        '{"status":"complete"}'
-      )
-      output = cli %w(deploy)
-      expect(output).to eq "doing\nsomething\ndone\n"
-    end
-
     it 'should scale an app', :with_socket do
       stub_request(
         :put,
-        TEST_DOMAIN + '/app/fakesha/scale?scaling_hash=%7B%22web%22:%223%22,%22worker%22:%222%22%7D'
+        TEST_DOMAIN + '/app/test-test/scale?scaling_hash=%7B%22web%22:%223%22,%22worker%22:%222%22%7D'
       ).to_return(body: '{"job": "123"}')
       allow(@socket).to receive(:gets).and_return(
         '{"body":"scaling"}',
@@ -84,21 +92,21 @@ describe 'Peas CLI' do
 
     describe 'Config ENV vars' do
       it 'should set config for an app' do
-        stub_request(:put, TEST_DOMAIN + '/app/fakesha/config?vars=%7B%22FOO%22:%22BAR%22%7D')
+        stub_request(:put, TEST_DOMAIN + '/app/test-test/config?vars=%7B%22FOO%22:%22BAR%22%7D')
           .to_return(body: response_mock("{'FOO' => 'BAR'}"))
         output = cli %w(config set FOO=BAR)
         expect(output).to eq "{'FOO' => 'BAR'}\n"
       end
 
       it 'delete config for an app' do
-        stub_request(:delete, TEST_DOMAIN + '/app/fakesha/config?keys=%5B%22FOO%22%5D')
+        stub_request(:delete, TEST_DOMAIN + '/app/test-test/config?keys=%5B%22FOO%22%5D')
           .to_return(body: response_mock(nil))
         output = cli %w(config rm FOO)
         expect(output).to eq "\n"
       end
 
       it 'should list all config for an app' do
-        stub_request(:get, TEST_DOMAIN + '/app/fakesha/config')
+        stub_request(:get, TEST_DOMAIN + '/app/test-test/config')
           .to_return(body: response_mock("{'FOO' => 'BAR'}\n{'MOO' => 'CAR'}"))
         output = cli %w(config)
         expect(output).to eq "{'FOO' => 'BAR'}\n{'MOO' => 'CAR'}\n"
@@ -129,7 +137,7 @@ describe 'Peas CLI' do
   end
 
   it 'should show a warning when there is a version mismatch' do
-    stub_request(:get, TEST_DOMAIN + '/app/fakesha/config')
+    stub_request(:get, TEST_DOMAIN + '/app/test-test/config')
         .to_return(body: '{"version": "100000.1000000.100000"}')
     output = cli %w(config)
     expect(output).to include 'Your version of the CLI client is out of date'

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ ENV['GLI_ENV'] = 'test'
 ROOT = File.join(File.expand_path(File.dirname(__FILE__)), '..')
 $LOAD_PATH.unshift(File.join(ROOT, 'lib'))
 TEST_DOMAIN = 'http://vcap.me:4000'
-SWITCHBOARD_TEST_PORT = 79_345
+SWITCHBOARD_TEST_PORT = 79345
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peas-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement