Moving model refactor work

- Updated cartridge manifest files
- Simplified descriptor
- Switched from mongo gem to use mongoid

Author: kraman

Rakefile

@@ -0,0 +1,25 @@
+require 'rake'
+
+begin
+  require 'yard'
+
+  namespace :doc do
+    desc 'Create Ruby docs for all components'
+    task :gen do
+      doc_dir = File.join(File.dirname(__FILE__), "doc")
+      FileUtils.rm_rf(doc_dir)
+      gems = Dir.glob("**/*.gemspec")
+      gems.each do |gem_file|
+        gem_src_dir = File.dirname(gem_file)
+        FileUtils.mkdir_p File.join(doc_dir, gem_src_dir)
+        
+        args = ['--protected', '--private', '--no-yardopts', "--output-dir #{File.join(doc_dir, gem_src_dir)}"] #, File.join(gem_src_dir, "**/*")
+        system "cd #{gem_src_dir}; yardoc #{args.join(" ")}\n"
+        system "yardoc README.md"
+      end
+    end
+  end
+rescue LoadError => e
+  print e.message
+  # YARD is not available
+end

broker/Gemfile

@@ -3,16 +3,15 @@ source 'http://rubygems.org'
 gem 'rails', '~> 3.2.8'
 gem 'json'
 gem 'parseconfig', '0.5.2'
-gem 'mongo'
 gem 'xml-simple'
 gem 'rack'
 gem 'regin'
 gem 'open4'
 gem 'openshift-origin-controller'
 gem 'rest-client'
 gem 'systemu'
-gem 'bson'
-gem 'bson_ext'
+gem 'minitest'
+gem 'mongoid'
 
 # Load plugin gems.
 Dir["/etc/openshift/plugins.d/*.conf"].delete_if{ |x| x.end_with? "-dev.conf" }.map{|x| File.basename(x, ".conf")}.each {|plugin| gem plugin}

broker/config/environment.rb

@@ -1,5 +1,31 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.adapters.delete(:root_filter)
+  SimpleCov.filters.clear
+  
+  class ProjectFilter < SimpleCov::Filter
+    def matches?(source_file)
+      engines = Rails.application.railties.engines.map { |e| e.config.root.to_s }
+      engines.each do |root_path|
+        return false if source_file.filename.start_with? root_path
+      end
+      return true
+    end
+  end
+  SimpleCov.add_filter ProjectFilter.new(nil)
+  
+  SimpleCov.start 'rails' do
+    coverage_dir 'test/coverage/'
+    command_name ENV["TEST_NAME"] || 'Broker tests'
+    add_group 'REST API Models', 'app/rest_models'
+    add_group 'Validators', 'app/validators'
+
+    merge_timeout 10000
+  end
+end
+
 # Initialize the rails application
 Broker::Application.initialize!

broker/config/mongoid.yml

@@ -0,0 +1,30 @@
+development:
+  sessions:
+    default:
+      database: openshift_broker_dev
+      hosts:
+        - localhost:27017
+      user: openshift
+      password: mooo
+      options:
+        ssl: false
+production:
+  sessions:
+    default:
+      database: openshift_broker_dev
+      hosts:
+        - localhost:27017
+      user: openshift
+      password: mooo
+      options:
+        ssl: false
+test:
+  sessions:
+    default:
+      database: openshift_broker_test
+      hosts:
+        - localhost:27017
+      user: openshift
+      password: mooo
+      options:
+        ssl: false

cartridges/openshift-origin-cartridge-10gen-mms-agent-0.1/info/manifest.yml

@@ -2,11 +2,10 @@ Name: 10gen-mms-agent-0.1
 Display-Name: 10gen Mongo Monitoring Service Agent 0.1
 Description: "MongoDB Monitoring Service (MMS) instruments MongoDB and provides information about current and historical operational metrics of your system."
 Version: 1.3.7
-License: ""
 License-Url: https://mms.10gen.com/links/terms-of-service
 Vendor: 10gen.com
 Categories:
-  - cartridge
+  - embedded
   - database-support
 Website: https://mms.10gen.com/
 Help-Topics:
@@ -15,30 +14,14 @@ Cart-Data:
   - Key: monitoring_url
     Type: cart_data
     Description: "10gen-mms-agent-0.1 monitoring URL"
-Suggests:
-    -
 Provides:
-  - "10gen-mms"
-Requires:
-Conflicts:
-Service-Dependencies: mongodb-2.2
-Native-Requires:
-Architecture: noarch
-Reservations:
-  - MEM >= 100MB
-Components:
-  default:
-    Service-Dependencies: ["mongodb-2.2"]
-    Subscribes:
-      set-mongo-connection-info:
-        Type: "NET_TCP:db:mongodb"
-        Required: true
-Groups:
-  default:
-    Components:
-      comp1: default
-    Scaling:
-      Min: 1
-      Max: 1
+  - "10gen-mms-agent-0.1"
+Subscribes:
+  set-mongo-connection-info:
+    Type: "NET_TCP:db:mongodb"
+    Required: true
+Scaling:
+  Min: 1
+  Max: 1
 Endpoints:
   - PROXY_PORT: 8080

cartridges/openshift-origin-cartridge-cron-1.4/info/manifest.yml

@@ -5,39 +5,26 @@ Display-Name: Cron 1.4
 Description: "The Cron cartridge allows you to run command line programs at scheduled times. Use this for background jobs and periodic processing."
 License: "ASL 2.0"
 License-Url: http://www.apache.org/licenses/LICENSE-2.0.txt
-Vendor:
-Categories:
-  - cartridge
 Website: "http://openshift.redhat.com/"
+Categories:
+  - embedded
 Help-Topics:
   "Getting Started Guide": https://openshift.redhat.com/community/blogs/getting-started-with-cron-jobs-on-openshift
-Cart-Data:
-Suggests:
-
-Provides: openshift-origin-cartridge-cron
-Native-Requires:
-  - cronie
-  - crontabs
-Profiles:
-  scheduler-service:
-    Provides: scheduler-service, cron-service
-    Components:
-      executor:
-        Publishes:
-          get-job-listing:
-            Type: "STRING:jobs"
-        Subscribes:
-          add-job:
-            Type: "STRING:job"
-          remove-job:
-            Type: "STRING:job"
-    Groups:
-      default:
-        Components:
-          job-executor: executor
-        Scaling:
-          Min: 1
-          Max: 1
-Default-Profile: scheduler-service
+Provides: 
+  - cron-1.4
+  - cron
+  - scheduler-service
+  - cron-service
+Publishes:
+  get-job-listing:
+    Type: "STRING:jobs"
+Subscribes:
+  add-job:
+    Type: "STRING:job"
+  remove-job:
+    Type: "STRING:job"
+Scaling:
+  Min: 1
+  Max: 1
 Endpoints:
   - PROXY_PORT: 8080

cartridges/openshift-origin-cartridge-diy-0.1/info/manifest.yml

@@ -4,9 +4,7 @@ Description: "The Do-It-Yourself (DIY) application type is a blank slate for try
 Version: 1.0.0
 License: "ASL 2.0"
 License-Url: http://www.apache.org/licenses/LICENSE-2.0.txt
-Vendor:
 Categories:
-  - cartridge
   - web_framework
   - experimental
 Website:
@@ -43,17 +41,10 @@ Cart-Data:
   - Key: OPENSHIFT_GEAR_UUID
     Type: environment
     Description: "Unique ID which identified the gear. This value changes between gears."
-Suggests:
-
 Provides:
-  - "diy-0.1"
-Requires:
-Conflicts:
-Native-Requires:
-Architecture: noarch
+  - diy-0.1
+  - diy
 Publishes:
-  get-doc-root:
-    Type: "FILESYSTEM:doc-root"
   publish-http-url:
     Type: "NET_TCP:httpd-proxy-info"
   publish-gear-endpoint:
@@ -65,8 +56,6 @@ Subscribes:
   set-nosql-db-connection-info:
     Type: "NET_TCP:nosqldb:connection-info"
     Required: false
-Reservations:
-  - MEM >= 10MB
 Scaling:
   Min: 1
   Max: 1

cartridges/openshift-origin-cartridge-haproxy-1.4/info/manifest.yml

@@ -6,38 +6,30 @@ License:
 License-Url:
 Vendor: http://haproxy.1wt.eu/
 Categories:
-  - cartridge
   - web_proxy
-  - git_host
   - scales
-Website:
-Help-Topics:
-Cart-Data:
-Suggests:
-
+  - embedded
+Website: http://haproxy.1wt.eu/
 Provides:
-  - "haproxy"
+  - haproxy-1.4
+  - haproxy
   - "haproxy(version) = 1.4"
-Requires:
-Conflicts:
-Native-Requires:
-  - "haproxy >= 1.4"
-Architecture: noarch
-Publishes:
-  get-balancer-connection-info:
-    Type: "NET_TCP:http:http"
-Subscribes:
-  haproxy-colocation-hack:
-    Type: "FILESYSTEM:haproxy:colocate-hack"
-  set-proxy:
-    Type: "NET_TCP:httpd-proxy-info"
-    Required : false
-  set-gear-endpoints:
-    Type: "NET_TCP:gear-endpoint-info"
-    Required: false
-  set-db-connection-info:
-    Type: "NET_TCP:db:connection-info"
-    Required: false
-Scaling:
-  Min: 1
-  Max: 1
+  - web_proxy
+Components:
+  web_proxy:
+    Publishes:
+      get-balancer-connection-info:
+        Type: "NET_TCP:http:http"
+    Subscribes:
+      set-proxy:
+        Type: "NET_TCP:httpd-proxy-info"
+        Required : false
+      set-gear-endpoints:
+        Type: "NET_TCP:gear-endpoint-info"
+        Required: false
+      set-db-connection-info:
+        Type: "NET_TCP:db:connection-info"
+        Required: false
+    Scaling:
+      Min: 1
+      Max: 1