zenslap 0.1.8 → 0.2.0

data/bin/zenslap

@@ -1,26 +1,15 @@
-#!/usr/bin/env ruby
-
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-
-require 'rubygems'
-
-require File.dirname(__FILE__) + '/../lib/zenslap'
-
-args = ARGV.dup
-ARGV.clear
-
-command = args.shift
-if command && ["create", "destroy"].include?(command)
-  Zenslap::Command.new.run(command)
-else 
-  puts <<-eos
-
-  === Zenslap commands
-
-  create   # create zenslap environment for this project
-  destroy  # destroy zenslap environment for this project  
-  
-  eos
-  
-end
+#!/bin/sh
+app=$(git config zenslap.zenslap)
+while [ "$app" = "" ]; do·
+  echo "Enter the name of the zenslap app"
+  read unvalidatedApp·
+  $(heroku config --app $unvalidatedApp)
+  if [ "$?" != "0" ]; then
+    echo $app
+  else
+    app=$unvalidatedApp
+    git config zenslap.zenslap $app
+  fi
+done
+echo $app
+heroku $* --app $app

data/zenslap.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zenslap}
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["opsb"]
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = %q{Client for zenslap continuous integration}
   s.email = %q{oliver@opsb.co.uk}
   s.executables = ["zenslap"]
-  s.files = Dir.glob("{bin,lib}/**/*") + %w(Gemfile zenslap.gemspec)
+  s.files = Dir.glob("{bin}/**/*") + %w(zenslap.gemspec)
 
   s.homepage = %q{http://github.com/opsb/zenslap-client}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -22,8 +22,6 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Client for zenslap continuous integration}
   s.test_files = Dir.glob("spec/**/*")  
-  s.add_dependency('heroku', ["= 1.10.10"])
-  s.add_dependency('opsb-git', ["= 1.2.11"])
-  s.add_dependency('rest-client', ["= 1.6.1"])
+  s.add_dependency('heroku', ["~> 1.17.8"])
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zenslap
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - opsb
@@ -24,48 +24,16 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 67
         segments: 
         - 1
-        - 10
-        - 10
-        version: 1.10.10
+        - 17
+        - 8
+        version: 1.17.8
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: opsb-git
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 2
-        - 11
-        version: 1.2.11
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
-  type: :runtime
-  version_requirements: *id003
 description: Client for zenslap continuous integration
 email: oliver@opsb.co.uk
 executables: 
@@ -76,17 +44,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/zenslap
-- lib/zenslap/client.rb
-- lib/zenslap/commands.rb
-- lib/zenslap/console_error.rb
-- lib/zenslap/git_repo.rb
-- lib/zenslap.rb
-- Gemfile
 - zenslap.gemspec
-- spec/client_spec.rb
-- spec/commands_spec.rb
-- spec/git_repo_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/opsb/zenslap-client
 licenses: []
@@ -121,8 +79,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client for zenslap continuous integration
-test_files: 
-- spec/client_spec.rb
-- spec/commands_spec.rb
-- spec/git_repo_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/Gemfile

@@ -1,22 +0,0 @@
-source :rubygems
-
-gemspec
-
-
-group :test do
-  gem 'rspec'
-  gem 'ruby-debug'
-  gem 'shoulda'
-  gem 'mocha'
-  gem 'bourne'
-  gem 'webmock', '1.3.5'
-  gem 'method_lister'
-end
-
-group :local do
-  gem 'autotest'
-  gem 'redgreen'
-  gem 'autotest-growl'
-  gem 'autotest-fsevent'
-  gem 'ruby-debug'
-end

data/lib/zenslap.rb

@@ -1,4 +0,0 @@
-require File.dirname(__FILE__) + '/zenslap/console_error'
-require File.dirname(__FILE__) + '/zenslap/client'
-require File.dirname(__FILE__) + '/zenslap/git_repo'
-require File.dirname(__FILE__) + '/zenslap/commands'  

data/lib/zenslap/client.rb

@@ -1,20 +0,0 @@
-require 'rest-client'
-
-class ZenslapClient
-  ZENSLAP_HOST = ENV['_ZENSLAP_CLIENT_HOST'] || "zenslap.me"
-  
-  def self.configure(uuid, repo_owner, repo_name, github_credentials, heroku_app)
-    #TODO need to make https
-    RestClient.post("http://#{ZENSLAP_HOST}/projects", 
-      {
-        :project => github_credentials.merge({
-                                              :owner => repo_owner, 
-                                              :name => repo_name,
-                                              :uuid => uuid,
-                                              :heroku_app => heroku_app
-                                             })
-      }
-    )
-  end
-  
-end

data/lib/zenslap/commands.rb

@@ -1,95 +0,0 @@
-require 'heroku'
-require 'heroku/command'
-
-module Zenslap
-  class Command
-
-    ZENSLAP_HEROKU_USER = "admin@zenslap.me"
-    ZENSLAP_ADDON = "zenslap2"
-
-    def run(command)
-      case command
-      when "create" then create
-      when "destroy" then destroy
-      else raise "#{command} command not found"
-      end
-    end
-
-    def display(message)
-      puts "---> #{message}"
-    end
-
-    def display_error(message)
-      puts "---! #{message}"
-    end
-
-    def display_numbered_bullets(items)
-      items.each_with_index do |item, index|
-        puts "  #{index}) #{item}"
-      end
-    end
-
-    def git_repo
-      @git_repo ||= GitRepo.new
-    end
-    
-    def heroku
-      Heroku::Command.run_internal('auth:client', [])
-    end
-    
-    def test_environment_name(name, owner)
-      full_name = "#{name}-zenslap-#{owner}".gsub(/[^a-zA-Z\d-]/, '-')
-      return full_name if full_name.length <= 30
-      return full_name[0, 27].gsub(/-+$/, "") + "-" + rand(99).to_s
-    end
-
-    def create
-      begin
-        if git_repo.remote_exists? 'zenslap'
-          display_error "Zenslap has already been set up"
-          return
-        end
-        
-        display "Checking for github details"
-        git_repo.github_owner
-        git_repo.github_name
-        git_repo.github_credentials
-
-        display "Creating test environment in heroku"
-        display "Using account: #{heroku.user}"
-        heroku_app = test_environment_name(git_repo.github_name, git_repo.github_owner)
-        display "Creating test environment: #{heroku_app}"
-        heroku.create heroku_app
-        heroku.add_collaborator(heroku_app, ZENSLAP_HEROKU_USER)
-        git_repo.add_zenslap_remote(heroku_app)
-
-        display "Installing zenslap addon"
-        heroku.install_addon heroku_app, ZENSLAP_ADDON
-        zenslap_id = heroku.config_vars(heroku_app)["ZENSLAP_ID"]
-
-        display "Configuring zenslap"
-        ZenslapClient.configure( zenslap_id, git_repo.github_owner, git_repo.github_name, git_repo.github_credentials, heroku_app )
-
-        display ""
-        display "Nearly there, you just need to do add a couple of things on github and you'll be ready to go"
-        display_numbered_bullets [
-          "Add 'zenslap' as a collaborator",
-          "Add 'http://zenslap.me/pushes' to the service hooks"
-        ]
-
-      rescue ConsoleError => e
-        display_error e
-      end
-    end
-
-    def destroy
-      display "Destroying zenslap project and test environment"
-      heroku.destroy git_repo.zenslap_app
-      display "Removing zenslap git remote"
-      git_repo.remove_zenslap_remote
-      display "All done. Thanks for using zenslap."
-    rescue ConsoleError => e
-      display_error e
-    end    
-  end
-end

data/lib/zenslap/console_error.rb

@@ -1,5 +0,0 @@
-class ConsoleError < RuntimeError  
-end
-
-class InvalidUrlError < ConsoleError
-end

data/lib/zenslap/git_repo.rb

@@ -1,88 +0,0 @@
-require 'git'
-
-class GitRepo
-  GITHUB_REGEX = /github.com[:\/](\S+)\/(\S+?)(?:\.git)?$/
-  HEROKU_GIT_REGEX = /git@heroku\..*?:(.*)\.git/  
-  
-  def github_url
-    @github_url ||= find_url("---> Which github repository do you want to use?", GITHUB_REGEX, "No github remotes found. You need to add one to your git config before you can add zenslap.")
-  end
-  
-  def find_url(help, regex, message)
-    remotes = git.remotes.select{ |r| r.url =~ regex }
-    raise ConsoleError.new(message) if remotes.empty?
-    remotes.length == 1 ? remotes.first.url : choose_one( help, remotes ).url
-  end
-  
-  def choose_one(help, remotes)
-    names = remotes.map &:name
-    begin 
-      puts help
-      puts names
-      name = gets.chomp
-    end while not names.include? name
-    remotes.find{ |r| r.name == name }
-  end  
-  
-  def github_credentials
-    { :login => retrieve_github('user'), :token => retrieve_github('token') }
-  end
-  
-  def add_zenslap_remote(name)
-    git.add_remote "zenslap", "git@heroku.com:#{name}.git"
-  end
-  
-  def remove_zenslap_remote
-    git.remote("zenslap").remove
-  end
-  
-  def zenslap_app
-    HEROKU_GIT_REGEX.match(git.remote("zenslap").url)[1]
-  end
-  
-  def remote_exists?(name)
-    !!git.remotes.find{|r|r.name == name}
-  end
-  
-  def retrieve_github(param)
-    value = exec("git config --get github.#{param}").strip
-    if value == ""
-      value = ask_for("your github #{param}")
-      exec("git config --add github.#{param} #{value}")
-    end
-    value
-  end
-  
-  def ask_for(message)
-    value = ""
-    while value == ""
-      puts "---> Please enter #{message}"
-      value = gets.strip
-    end
-    value
-  end
-  
-  def exec(command)
-    `#{command}`
-  end    
-  
-  def git
-    Git.open('.')
-  end
-  
-  def github_owner
-    @owner ||= parse_github_url[0]
-  end
-  
-  def github_name
-    @name ||= parse_github_url[1]
-  end
-  
-  private 
-  
-  def parse_github_url
-    search_result = /github.com[:\/](\S+)\/(\S+?)(?:\.git)?$/.match(github_url)
-    raise InvalidUrlError, github_url unless search_result
-    owner, name = search_result[1..2]
-  end
-end

data/spec/client_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require 'net/http'
-require 'uri'
-
-describe ZenslapClient do
-  
-  context "zenslap client" do
-    ZENSLAP_ID = 5
-    OWNER = "opsb"
-    NAME = "carbonpt"
-    GITHUB_CREDENTIALS = { :login => 'jimbo', :token => 'randomhash'}
-    HEROKU_EMAIL = "jim@bob.com"
-    HEROKU_PASSWORD = "password"
-    HEROKU_APP = "conference_hub_ci"
-    
-    before do
-      RestClient.stubs(:post)      
-    end
-    
-    it "should configure the project" do
-      ZenslapClient.configure ZENSLAP_ID, OWNER, NAME, GITHUB_CREDENTIALS, HEROKU_APP
-      RestClient.should have_received(:post).with( "http://zenslap.me/projects", :project => 
-        GITHUB_CREDENTIALS.merge({ :owner => OWNER, :name => NAME, :uuid => ZENSLAP_ID, :heroku_app => HEROKU_APP } ))
-    end
-
-  end
-end

data/spec/commands_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper.rb'
-require 'heroku'
-
-module ZenslapSpec
-
-  describe Zenslap::Command do
-    ZENSLAP_ID = 1
-    GITHUB_URL = "git@github.com:opsb/conference_hub"
-    GITHUB_REPO_OWNER = "opsb"
-    GITHUB_REPO_NAME = "conference_hub"
-    GITHUB_LOGIN = "jimbo"
-    GITHUB_TOKEN = "df67sd6f67"
-    GITHUB_CREDENTIALS = { :login => GITHUB_LOGIN, :token => GITHUB_TOKEN }  
-    HEROKU_EMAIL = "jim@bob.com"
-    HEROKU_PASSWORD = "password"
-    HEROKU_APP = "conference-hub-zenslap-opsb"
-    ADDON_NAME = "zenslap2"
-
-    def stub_git
-      @git_repo = stub do
-        stubs(:github_url).returns(GITHUB_URL)
-        stubs(:github_credentials).returns(GITHUB_CREDENTIALS)
-        stubs(:github_owner).returns(GITHUB_REPO_OWNER)
-        stubs(:github_name).returns(GITHUB_REPO_NAME)
-        stubs(:add_zenslap_remote)
-        stubs(:remove_zenslap_remote)        
-        stubs(:zenslap_app).returns(HEROKU_APP)
-      end
-      GitRepo.stubs(:new).returns(@git_repo)
-    end
-
-    def stub_zenslap
-      ZenslapClient.stubs(:configure)
-    end
-
-    def stub_heroku
-      @heroku = stub do
-        stubs(:user).returns(HEROKU_EMAIL)
-        stubs(:password).returns(HEROKU_PASSWORD)
-        stubs(:create).returns(HEROKU_APP)
-        stubs(:add_collaborator)
-        stubs(:install_addon)
-        stubs(:config_vars).returns({ "ZENSLAP_ID" => ZENSLAP_ID })
-        stubs(:destroy)      
-      end
-      Heroku::Command.stubs(:run_internal).with('auth:client', []).returns(@heroku)
-    end
-
-    context "zenslap" do
-      before do
-        @command = Zenslap::Command.new
-        @command.stubs(:display_error)
-        @command.stubs(:display)
-        @command.stubs(:display_numbered_bullets)
-        stub_git
-        stub_zenslap
-        stub_heroku    
-      end
-      
-      it "should ensure test environment names have a maximum of 30 characters" do
-        name = @command.test_environment_name("delayed_job_groups_mongoid", "opsb")
-        name.should match /^delayed-job-groups-mongoid-\d+/
-        name.length.should be <= 30
-      end
-
-      context "#create" do
-        context "when zenslap has already been created" do
-          before do
-            @git_repo.stubs(:remote_exists?).with("zenslap").returns(true)
-            @command.create
-          end
-                    
-          it "should display message saying zenslap has already been created" do
-            @command.should have_received(:display_error).with("Zenslap has already been set up")
-          end
-        end
-        
-        context "before zenslap has been created" do
-          before do
-            @git_repo.stubs(:remote_exists?).with("zenslap").returns(false)            
-            @command.create
-          end
-
-          it "should create new heroku app to be used for running tests and billing" do
-            @heroku.should have_received(:create).with( HEROKU_APP )
-          end      
-
-          it "should add zenslap remote" do
-            assert_received @git_repo, :add_zenslap_remote, &with( HEROKU_APP )
-          end
-
-          it "should add zenslap as a collaborator to heroku app" do
-            assert_received @heroku, :add_collaborator, &with( HEROKU_APP, "admin@zenslap.me" )
-          end
-
-          it "should install addon" do
-            assert_received @heroku, :install_addon, &with( HEROKU_APP, ADDON_NAME )
-          end
-
-          it "should configure zenslap with github and heroku details" do
-            assert_received ZenslapClient, :configure, 
-            &with( ZENSLAP_ID, GITHUB_REPO_OWNER, GITHUB_REPO_NAME, GITHUB_CREDENTIALS, HEROKU_APP )
-          end          
-        end
-      end
-
-      context "#destroy" do
-        before do
-          @command.destroy
-        end
-
-        it "should destroy heroku app" do
-          assert_received @heroku, :destroy, &with(HEROKU_APP)
-        end
-        
-        it "should remove zenslap remote" do
-          @git_repo.should have_received(:remove_zenslap_remote)
-        end
-      end
-    end  
-  end
-end

data/spec/git_repo_spec.rb

@@ -1,157 +0,0 @@
-require 'spec_helper'
-
-module GitRepoSpec
-  HEROKU_URL= "git@heroku.com:conference_hub.git"
-  GITHUB_URL = "git@github.com:opsb/conference_hub"
-  ZENSLAP_URL = "git@heroku.com:conference_hub-zenslap.git"
-  GITHUB_USER = "jimbo"
-  GITHUB_TOKEN = "df67sd6f67"
-  HEROKU_APP = "conference_hub"
-  ZENSLAP_ID = "abc"
-  ZENSLAP_APP = "conference_hub_ci"
-  ZENSLAP_GIT_REPO = "git@heroku.com:#{ZENSLAP_APP}.git"
-  
-  INVALID_GITHUB_URLS = [
-    "git@invalidhub.com:opsb/conference_hub.git",
-    "https://opsb@github.com/opsbconference_hub.git",
-    "http://github.com.git"
-  ]
-
-  VALID_GITHUB_URLS = [
-    "git@github.com:opsb/conference_hub.git",
-    "https://opsb@github.com/opsb/conference_hub.git",
-    "http://github.com/bblim-ke/we-bmo-ck.git",
-    "http://github.com/bblim-ke/we.bmo.ck.git",
-    "git@github.com:opsb/heroku-zenslap"
-  ]  
-
-  describe GitRepo do
-    def stub_git
-      origin_remote = stub(:name => "origin", :url => GITHUB_URL)
-      @zenslap_remote = stub(:name => "zenslap", :url => ZENSLAP_URL, :remove => nil)
-      @git = stub do
-        stubs(:remotes).returns([origin_remote])
-        stubs(:add_remote)
-        stubs(:config)
-      end
-      @git.stubs(:remote).with("zenslap").returns(@zenslap_remote)
-      Git.stubs(:open).returns(@git)      
-    end  
-
-    context "repository" do
-      before do
-        stub_git
-        @git_repo = GitRepo.new
-      end
-
-      it "should have github owner" do
-        assert_equal @git_repo.github_owner, "opsb"
-      end
-
-      it "should have github name" do
-        assert_equal @git_repo.github_name, "conference_hub"
-      end
-
-      it "should have github_url" do
-        assert_equal @git_repo.github_url, GITHUB_URL
-      end
-
-      it "should know if a remote exists" do
-        @git_repo.remote_exists?('origin').should be_true
-      end
-
-      it "should know if a remote does not exist" do
-        @git_repo.remote_exists?('non existent remote').should be_false          
-      end
-
-      it "should add zenslap remote" do
-        @git_repo.add_zenslap_remote(HEROKU_APP)
-        @git.should have_received(:add_remote).with("zenslap", HEROKU_URL)
-      end
-
-      it "should remove zenslap remote" do
-        @git_repo.remove_zenslap_remote
-        @zenslap_remote.should have_received(:remove)
-      end
-
-      VALID_GITHUB_URLS.each do |url|    
-        context "with remote: #{url}" do
-          before do
-            @git = stub(:remotes => [stub(:url => url)])
-            Git.stubs(:open).returns(@git)              
-          end
-
-          it "should have valid github url" do
-            @git_repo.github_url.should == url
-          end
-
-          it "should have valid github owner" do
-            @git_repo.github_owner.should_not be_blank
-          end
-        end
-      end
-
-      INVALID_GITHUB_URLS.each do |url|    
-        it "should not accept invalid github url #{url}" do
-          git_repo = stub(:remotes => [stub(:url => url)])
-          Git.stubs(:open).returns(git_repo)        
-          lambda {
-            @git_repo.github_url          
-            }.should raise_error(ConsoleError)
-          end
-        end
-
-        context "with zenslap remote" do
-          it "should have zenslap app" do
-            @git.stubs(:remote).with("zenslap").returns(stub( :name => "zenslap", :url => ZENSLAP_GIT_REPO))        
-            assert_equal @git_repo.zenslap_app, ZENSLAP_APP
-          end
-        end
-
-        context "with stored github.user" do
-          before do
-            @git_repo.stubs(:exec).with("git config --get github.user").returns(GITHUB_USER + "\n")
-            @git_repo.stubs(:exec).with("git config --get github.token").returns(GITHUB_TOKEN + "\n")        
-          end
-
-          it "should have github_credentials" do  
-            assert_equal @git_repo.github_credentials, {:login => GITHUB_USER, :token => GITHUB_TOKEN}
-          end
-        end
-
-        context "missing github credentials" do
-          before do
-            @git_repo.stubs(:exec).with("git config --get github.user").returns("")
-            @git_repo.stubs(:exec).with("git config --get github.token").returns("")
-
-            @git_repo.stubs(:ask_for).with("your github user").returns(GITHUB_USER)
-            @git_repo.stubs(:ask_for).with("your github token").returns(GITHUB_TOKEN)
-
-            @git_repo.stubs(:exec).with("git config --add github.user #{GITHUB_USER}")
-            @git_repo.stubs(:exec).with("git config --add github.token #{GITHUB_TOKEN}")        
-
-            @git_repo.github_credentials
-          end
-
-          it "should have asked for a github user" do
-            assert_received @git_repo, :ask_for, &with("your github user")
-          end
-
-          it "should have asked for a github token" do
-            assert_received @git_repo, :ask_for, &with("your github token")        
-          end
-        end
-
-        context "missing github address" do
-          it "should show error" do
-            Git.stubs( :open ).returns( stub( :remotes => [] ) )
-            assert_raise ConsoleError do
-              @git_repo.github_url
-            end
-          end
-        end
-
-      end
-    end
-
-  end

data/spec/spec_helper.rb

@@ -1,39 +0,0 @@
-Bundler.require(:default, :test)
-require 'test/unit'
-require 'shoulda'
-require 'rspec'
-require 'mocha'
-require 'bourne'
-require 'ruby-debug'
-
-require File.dirname(__FILE__) + '/../lib/zenslap.rb'
-
-
-RSpec.configure do |config|
-  config.mock_with :mocha
-  config.include Test::Unit::Assertions
-end
-
-def with(*args)
-  Proc.new do |expect|
-    expect.with *args
-  end
-end
-
-#Uncomment if you wish to see the requests and responses
-# WebMock.after_request do |request_signature, response|
-#   puts "Request #{request_signature} was made and #{response} was returned"
-# end
-
-def show_invocations
-  puts
-  puts "Invocations"
-  puts "==========="
-  puts
-  Mocha::Mockery.instance.invocations.each do |invocation|
-    puts("#{invocation.mock.inspect}.#{invocation.method_name}( %s )\n\n" % [
-      invocation.arguments.map(&:inspect).join(", ")
-    ])
-  end
-end
-