beanstalkapp 1.1.3 → 1.2.0

data/CHANGES.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 1.2.0
+
+* Added support for reworked Beanstalk Deployments. New model added: ServerEnvironment.
+
 == 1.1.3
 
 * Added ReleaseServer#toggle_state! method for enabling/disabling Releases servers.

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/beanstalkapp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beanstalkapp}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-08-16}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -30,13 +30,18 @@ Gem::Specification.new do |s|
      "lib/beanstalkapp/release.rb",
      "lib/beanstalkapp/release_server.rb",
      "lib/beanstalkapp/repository.rb",
-     "lib/beanstalkapp/user.rb"
+     "lib/beanstalkapp/server_environment.rb",
+     "lib/beanstalkapp/user.rb",
+     "test/integration.rb"
   ]
   s.homepage = %q{http://api.beanstalkapp.com}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Official wrapper for Beanstalk API.}
+  s.test_files = [
+    "test/integration.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/beanstalkapp.rb

@@ -10,6 +10,7 @@ require 'beanstalkapp/account'
 require 'beanstalkapp/changeset'
 require 'beanstalkapp/repository'
 require 'beanstalkapp/comment'
+require 'beanstalkapp/server_environment'
 require 'beanstalkapp/release'
 require 'beanstalkapp/release_server'
 require 'beanstalkapp/user'

data/lib/beanstalkapp/base.rb

@@ -2,7 +2,8 @@ module Beanstalk
   module API
     class Base < ActiveResource::Base
       def self.setup(options)
-        self.site = "http://#{options[:domain]}.beanstalkapp.com/api"
+        options[:host] ||= "beanstalkapp.com"
+        self.site = "http://#{options[:domain]}.#{options[:host]}/api"
         self.user = options[:login]
         self.password = options[:password]
       end
@@ -11,7 +12,7 @@ module Beanstalk
         str.gsub!(/^\//, '')
         class_eval(<<-CODE)
           def self.site
-            URI.parse(Beanstalk::API::Base.site.to_s + "/#{str}")
+            URI.parse(File.join(Beanstalk::API::Base.site.to_s, #{str.inspect}))
           end
         CODE
       end

data/lib/beanstalkapp/release.rb

@@ -3,7 +3,11 @@ module Beanstalk::API
     add_prefix ':repository_id'
     
     def self.find_all_for_repository(repo_id)
-      find :all, :params => { :repository_id => repo_id }
+      raise "This method was removed. To lookup Releases use Release#find_all_for_environment method. Sorry."
+    end
+    
+    def self.find_all_for_environment(environment_id, repo_id)
+      find :all, :params => { :repository_id => repo_id, :environment_id => environment_id }
     end
     
     def self.find_for_repository(id, repo_id)

data/lib/beanstalkapp/release_server.rb

@@ -3,21 +3,19 @@ module Beanstalk::API
     add_prefix ':repository_id'
     
     def self.find_all_for_repository(repo_id)
-      find :all, :params => { :repository_id => repo_id }
+      raise "This method was removed. To lookup ReleaseServers use ReleaseServer#find_all_for_environment method. Sorry."
     end
     
-    def self.find_for_repository(name, repo_id)
-      find name, :params => { :repository_id => repo_id }
+    def self.find_for_repository(id, repository_id)
+      find id, :params => { :repository_id => repository_id }
     end
-    
-    def to_param
-      name
+
+    def self.find_all_for_environment(environment_id, repository_id)
+      find :all, :params => { :repository_id => repository_id, :environment_id => environment_id }
     end
-    
+        
     def toggle_state!
-      repo_id = prefix_options[:repository_id]
-      path = element_path(:repository_id => repo_id, :id => to_param).gsub(".xml", '/toggle_state.xml')
-      connection.put(path)
+      raise "ReleaseServer#toggle_state! method was removed due to changes in how Beanstalk Deployments work. Sorry"
     end
         
   end

data/lib/beanstalkapp/server_environment.rb

@@ -0,0 +1,14 @@
+module Beanstalk::API
+  class ServerEnvironment < Base
+    add_prefix ':repository_id'
+    
+    def self.find_all_for_repository(repo_id)
+      find :all, :params => { :repository_id => repo_id }
+    end
+    
+    def self.find_for_repository(id, repo_id)
+      find id, :params => { :repository_id => repo_id }
+    end
+    
+  end
+end

data/test/integration.rb

@@ -0,0 +1,88 @@
+require 'rubygems'
+$: << "lib/"
+require 'lib/beanstalkapp'
+
+Beanstalk::API::Base.setup(
+  :host     => 'beanstalk.local',
+  :domain   => 'apricode',
+  :login    => 'railsmonk',
+  :password => '123456'
+)
+
+def test(code_or_text)
+  puts "---- #{code_or_text}"
+  if block_given?
+    p yield
+  else
+    p eval(code_or_text)
+  end
+  puts
+end
+
+$repository_id = 15
+$environment_id = 6
+$release_server_id = 7
+$release_id = 57
+$existing_revision = "f99193ed1f3dcdfa7f30632049a944ca4a53c139"
+
+test "Beanstalk::API::Account.find"
+test "Beanstalk::API::Repository.find($repository_id)"
+test "Beanstalk::API::Repository.find(:all)"
+test "Beanstalk::API::Release.find_all_for_environment($environment_id, $repository_id)"
+test "Beanstalk::API::Release.find_for_repository($release_id, $repository_id)"
+test "Beanstalk::API::ReleaseServer.find_all_for_environment($environment_id, $repository_id)"
+test "Beanstalk::API::ReleaseServer.find_for_repository($release_server_id, $repository_id)"
+test "Beanstalk::API::ServerEnvironment.find_all_for_repository($repository_id)"
+test "Beanstalk::API::ServerEnvironment.find_for_repository($environment_id, $repository_id)"
+
+test "Create ReleaseServer" do
+  server = Beanstalk::API::ReleaseServer.new(
+    :name        => "development",
+    :local_path  => "/trunk",
+    :remote_path => "/var/www/my_site",
+    :remote_addr => "myftpserver.com",
+    :protocol    => "ftp",
+    :port        => 21,
+    :login       => "username",
+    :password    => "topsecret"
+  )
+  server.prefix_options = { :repository_id => $repository_id, :environment_id => $environment_id}
+  server.save
+  server
+end
+
+test "Update ReleaseServer" do
+  server = Beanstalk::API::ReleaseServer.find_for_repository($release_server_id, $repository_id)
+  server.prefix_options = { :repository_id => $repository_id }  
+  server.local_path = "/"
+  server.save
+  server
+end
+
+test "Create ServerEnvironment" do
+  env = Beanstalk::API::ServerEnvironment.new(
+    :name        => "Macaroni",
+    :automatic   => true,
+    :branch_name => "master"
+  )
+  env.prefix_options = { :repository_id => $repository_id }
+  env.save
+  env
+end
+
+test "Update ServerEnvironment" do
+  env = Beanstalk::API::ServerEnvironment.find_for_repository($environment_id, $repository_id)
+  env.name = "Mascarpone"
+  env.prefix_options = { :repository_id => $repository_id }
+  env.save
+  env
+end
+
+test "Create new Release" do
+  r = Beanstalk::API::Release.new
+  r.prefix_options = { :repository_id => $repository_id, :environment_id => $environment_id }
+  r.release_server_id = $release_server_id
+  r.revision = ""
+  r.save
+  r
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beanstalkapp
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +07:00
+date: 2010-08-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,9 @@ files:
 - lib/beanstalkapp/release.rb
 - lib/beanstalkapp/release_server.rb
 - lib/beanstalkapp/repository.rb
+- lib/beanstalkapp/server_environment.rb
 - lib/beanstalkapp/user.rb
+- test/integration.rb
 has_rdoc: true
 homepage: http://api.beanstalkapp.com
 licenses: []
@@ -75,5 +77,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Official wrapper for Beanstalk API.
-test_files: []
-
+test_files: 
+- test/integration.rb