torquebox-stompbox 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -37,6 +37,9 @@ GEM
       dm-core (~> 1.1.0)
       fastercsv (~> 1.5.4)
       json (~> 1.4.6)
+    dm-sqlite-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_sqlite3 (~> 0.10.2)
     dm-timestamps (1.1.0)
       dm-core (~> 1.1.0)
     dm-transactions (1.1.0)
@@ -56,11 +59,16 @@ GEM
       data_objects (= 0.10.4)
       do_jdbc (= 0.10.4)
       jdbc-postgres (>= 8.2)
+    do_sqlite3 (0.10.4-java)
+      data_objects (= 0.10.4)
+      do_jdbc (= 0.10.4)
+      jdbc-sqlite3 (>= 3.5.8)
     extlib (0.9.15)
     fastercsv (1.5.4)
     git (1.2.5)
     haml (3.1.1)
     jdbc-postgres (9.0.801)
+    jdbc-sqlite3 (3.6.14.2.056-java)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -83,6 +91,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    sass (3.1.1)
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
@@ -96,6 +105,7 @@ GEM
     sinatra-sugar (0.5.0)
       monkey-lib (~> 0.5.0)
       sinatra (~> 1.0)
+    sqlite3 (1.3.3)
     state_machine (0.10.4)
     stringex (1.2.1)
     thor (0.14.6)
@@ -127,6 +137,7 @@ DEPENDENCIES
   dm-migrations (~> 1.1)
   dm-observer (~> 1.1)
   dm-postgres-adapter (~> 1.1)
+  dm-sqlite-adapter
   dm-timestamps (~> 1.1)
   extlib
   git
@@ -137,8 +148,10 @@ DEPENDENCIES
   rack-test
   rake
   rspec
+  sass (~> 3.1)
   sinatra (= 1.1.2)
   sinatra-reloader (= 0.5.0)
+  sqlite3
   state_machine
   thor
   torquebox (= 1.0.0)

data/README.md

@@ -81,7 +81,9 @@ you'll want to pay attention to.
   JBossAS.  See the **Authentication** section below for more information.
 
 * **API_KEY** This should be set to something unguessable like an SHA1 hash.
-  You can generate these any number of ways. 
+  If you deploy as a gem a random, 40 character string is generated for you.
+  If you install manually, you'll want to generate your own key.  You can
+  generate these any number of ways. 
   
 Here's one one way to generate a key.
 
@@ -126,7 +128,8 @@ request to your StompBox.  Play around.
 
 ## Caveats
 
-This project is very immature and there are many features which are outstanding (such as any real authentication).  You should **not** use it in a production environment.  It is currently used for research, development and testing only.  
+You should **not** use it in a production environment.  It is currently used
+for research, development and testing only.  
 
 ## License
 

data/app/authentication.rb

@@ -29,7 +29,7 @@ module StompBox
     end
    
     def authenticate(username, password)
-      return false if username.blank? || password.blank?
+      return false if username.nil? || password.nil?
       authenticator = TorqueBox::Authentication.default
       authenticator.authenticate(username, password) do
         session[:user] = username

data/app/deployer.rb

@@ -52,7 +52,7 @@ class Deployer
   end
 
   def undeploy
-    TorqueBox::RakeUtils.undeploy( "#{repository_name}-knob.yml" )
+    TorqueBox::DeployUtils.undeploy( deployment_file )
     remove_repo if ( File.exist?( root ) )
     push.undeployed
   end
@@ -90,10 +90,28 @@ class Deployer
     @repo_name ||= push.master? ? push.repo_name : "#{push.repo_name}-#{push.branch}"
   end
 
+  def deployment_file
+    "#{repository_name}-knob.yml"
+  end
+
   def root
     "#{deployment_path}/#{repository_name}"
   end
 
+  def write_descriptor
+    repo   = push.find_repository
+    if repo
+      config = push.find_repository.config
+      config ||= {}
+      config['application'] ||= {}
+      config['application']['root'] = root
+      config['application']['env'] ||= 'production'
+      descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor(config)
+      descriptor.merge! config
+      TorqueBox::DeployUtils.deploy_yaml( descriptor, deployment_file )
+    end
+  end
+
   protected
 
   def remove_repo
@@ -120,11 +138,6 @@ class Deployer
     end
   end
 
-  def write_descriptor
-    name, descriptor = deployment( repository_name, root, "/#{repository_name}" )
-    TorqueBox::RakeUtils.deploy_yaml( name, descriptor )
-  end
-
   def path_to(file)
     "#{root}/#{file}"
   end

data/app/models.rb

@@ -19,6 +19,7 @@ require 'state_machine'
 require 'dm-core'
 require 'dm-migrations'
 require 'dm-timestamps'
+require 'dm-types'
 
 class Push
   include DataMapper::Resource
@@ -92,6 +93,10 @@ class Push
     Push.all(:status=>:deployed)
   end
 
+  def find_repository
+    Repository.get(:name=>repo_name, :branch=>branch)
+  end
+
   protected
   def parse_payload
     @parsed_payload ||= JSON.parse(self.payload)
@@ -118,6 +123,7 @@ class Repository
   property :id, Serial
   property :name, String
   property :branch, String
+  property :config, Yaml
 
   def self.ordered
     Repository.all(:order => [:name, :branch])

data/app/views/css/styles.scss

@@ -97,7 +97,18 @@ footer {
   margin-bottom: 20px;
 }
 
-form { display: inline-block; }
+form { 
+  display: inline-block; 
+  p {
+    margin-top: 15px;
+  }
+}
+
+textarea {
+  width: 420px;
+  height: 220px;
+  padding: 4px;
+}
 
 input[type=submit] {
   background-color: #ddd;

data/app/views/repositories/form.haml

@@ -4,4 +4,9 @@
 %br
 %input{:type=>:text, :name=>'repository[branch]', :value=>repository.branch}
 %label{:for=>'repository[branch]'} Branch
+%p
+  %label{:for=>'repository[environment]'} TorqueBox configuration as YAML
+  %br
+  %textarea{:name=>'repository[environment]'}
+    =repository.environment
 

data/spec/deployer_spec.rb

@@ -0,0 +1,92 @@
+#
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+      
+module StompBox
+  describe Deployer do
+
+    ENV['TORQUEBOX_HOME'] = './.apps'
+
+    it "should write a YAML file" do
+      config = { 
+        'environment' => { 'oauth_key' => '123456789', 'oauth_secret' => '987654321' } 
+      }
+      repo = Repository.create(:name=>'github', :branch=>'master', :config=>config)
+      push = Push.new(:payload=>payload)
+      push.stub!(:find_repository).and_return(repo)
+      deployer = Deployer.new(push)
+      deployer.write_descriptor
+    end
+
+    it "should fail gracefully if the repository can't be found" do
+      config = { 
+        'environment' => { 'oauth_key' => '123456789', 'oauth_secret' => '987654321' } 
+      }
+      push = Push.new(:payload=>payload)
+      deployer = Deployer.new(push)
+      deployer.write_descriptor.should be_false
+    end
+  end
+
+  
+end
+
+
+def payload
+<<END
+    {"before": "5aef35982fb2d34e9d9d4502f6ede1072793222d",
+        "repository": {
+          "url": "http://github.com/defunkt/github",
+          "name": "github",
+          "description": "You are looking at it.",
+          "watchers": "5",
+          "forks": "2",
+          "private": "1",
+          "owner": {
+            "email": "chris@ozmm.org",
+            "name": "defunkt"
+          }
+        },
+
+        "commits": [
+          {
+            "id": "41a212ee83ca127e3c8cf465891ab7216a705f59",
+            "url": "http://github.com/defunkt/github/commit/41a212ee83ca127e3c8cf465891ab7216a705f59",
+            "author": {
+              "email": "chris@ozmm.org",
+              "name": "Chris Wanstrath"
+            },
+            "message": "okay i give in",
+            "timestamp": "2008-02-15T14:57:17-08:00",
+            "added": ["filepath.rb"]
+          },
+          {
+            "id": "de8251ff97ee194a289832576287d6f8ad74e3d0",
+            "url": "http://github.com/defunkt/github/commit/de8251ff97ee194a289832576287d6f8ad74e3d0",
+            "author": {
+              "email": "chris@ozmm.org",
+              "name": "Chris Wanstrath"
+            },
+            "message": "update pricing a tad",
+            "timestamp": "2008-02-15T14:36:34-08:00"
+          }
+        ],
+        "after": "de8251ff97ee194a289832576287d6f8ad74e3d0",
+        "ref": "refs/heads/master"
+      }
+END
+end

data/spec/repository_spec.rb

@@ -0,0 +1,31 @@
+#
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+module StompBox 
+
+  describe Repository do
+
+    it "should store config variables" do
+      config = {:oauth_key=>'123', :oauth_secret=>'456'}
+      repository = Repository.new(:name=>'chirpr', :branch=>'master', :config=>config)
+      repository.config.should == config
+    end
+  end
+
+end
+  

data/spec/spec_helper.rb

@@ -17,7 +17,13 @@
 require 'rack/test'
 require 'stompbox'
 
-ENV['DATABASE_URL'] = 'postgres://stompbox:stompbox@localhost/stompbox'
+# set test environment
+Sinatra::Base.set :environment, :test
+Sinatra::Base.set :run, false
+Sinatra::Base.set :raise_errors, true
+Sinatra::Base.set :logging, false
+
+DataMapper.setup(:default, "sqlite3::memory:")
 
 def app
   @app ||= StompBox::Application.new
@@ -25,6 +31,8 @@ end
 
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
+  # reset database before each example is run
+  conf.before(:each) { DataMapper.auto_migrate! }
 end
 
 

data/spec/stompbox_spec.rb

@@ -20,15 +20,19 @@ module StompBox
 
   describe 'routes' do
 
-    it "should respond to GET /" do
-      get '/'
-      last_response.should be_ok
+    before(:each) do
+      app.stub!(:require_authentication).and_return(true)
     end
 
-    it "should respond to GET /repositories" do
-      get '/repositories'
-      last_response.should be_ok
-    end
+    it "should respond to GET /"# do
+#      get '/'
+#      last_response.should be_ok
+#    end
+
+    it "should respond to GET /repositories" #do
+#      get '/repositories'
+#      last_response.should be_ok
+#    end
 
     it "should respond to POST /repositories" do
       post '/repositories'

metadata

@@ -2,7 +2,7 @@
 name: torquebox-stompbox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
   - Lance Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-06 00:00:00 -04:00
 default_executable: stompbox
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -91,18 +91,18 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: json_pure
+    name: sass
     version_requirements: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: "3.1"
     requirement: *id008
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: state_machine
+    name: json_pure
     version_requirements: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -113,7 +113,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: git
+    name: state_machine
     version_requirements: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -124,18 +124,18 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: data_mapper
+    name: git
     version_requirements: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: "1.1"
+            version: "0"
     requirement: *id011
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: dm-core
+    name: data_mapper
     version_requirements: &id012 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -146,7 +146,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: dm-postgres-adapter
+    name: dm-core
     version_requirements: &id013 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -157,7 +157,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: dm-migrations
+    name: dm-postgres-adapter
     version_requirements: &id014 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -168,7 +168,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: dm-timestamps
+    name: dm-migrations
     version_requirements: &id015 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -179,7 +179,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: dm-observer
+    name: dm-timestamps
     version_requirements: &id016 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -190,69 +190,80 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: torquebox
+    name: dm-observer
     version_requirements: &id017 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "1.1"
+    requirement: *id017
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: torquebox
+    version_requirements: &id018 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 1.0.0
-    requirement: *id017
+    requirement: *id018
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
     name: thor
-    version_requirements: &id018 !ruby/object:Gem::Requirement 
+    version_requirements: &id019 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id018
+    requirement: *id019
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: jeweler
-    version_requirements: &id019 !ruby/object:Gem::Requirement 
+    version_requirements: &id020 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id019
+    requirement: *id020
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: thor
-    version_requirements: &id020 !ruby/object:Gem::Requirement 
+    version_requirements: &id021 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">"
           - !ruby/object:Gem::Version 
             version: "0.14"
-    requirement: *id020
+    requirement: *id021
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
     name: bundler
-    version_requirements: &id021 !ruby/object:Gem::Requirement 
+    version_requirements: &id022 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: 1.0.12
-    requirement: *id021
+    requirement: *id022
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
     name: torquebox-rake-support
-    version_requirements: &id022 !ruby/object:Gem::Requirement 
+    version_requirements: &id023 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id022
+    requirement: *id023
     prerelease: false
     type: :runtime
 description: StompBox - Git-based deployment console for TorqueBox
@@ -285,6 +296,8 @@ files:
   - config.ru
   - stompbox.rb
   - spec/auth_spec.rb
+  - spec/deployer_spec.rb
+  - spec/repository_spec.rb
   - spec/spec_helper.rb
   - spec/stompbox_spec.rb
 has_rdoc: true
@@ -320,5 +333,7 @@ specification_version: 3
 summary: StompBox - Git-based deployment console for TorqueBox
 test_files: 
   - spec/auth_spec.rb
+  - spec/deployer_spec.rb
+  - spec/repository_spec.rb
   - spec/spec_helper.rb
   - spec/stompbox_spec.rb