capricorn 2.0.8 → 2.0.9

data/erlang/lib/misultin/src/misultin_ws.erl

@@ -0,0 +1,78 @@
+% ==========================================================================================================
+% MISULTIN - Websocket Request
+%
+% >-|-|-(°>
+% 
+% Copyright (C) 2010, Roberto Ostinelli <roberto@ostinelli.net>.
+% All rights reserved.
+%
+% BSD License
+% 
+% Redistribution and use in source and binary forms, with or without modification, are permitted provided
+% that the following conditions are met:
+%
+%  * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+%	 following disclaimer.
+%  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+%	 the following disclaimer in the documentation and/or other materials provided with the distribution.
+%  * Neither the name of the authors nor the names of its contributors may be used to endorse or promote
+%	 products derived from this software without specific prior written permission.
+%
+% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+% WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+% PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+% ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+% TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+% HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+% POSSIBILITY OF SUCH DAMAGE.
+% ==========================================================================================================
+-module(misultin_ws, [Ws, SocketPid]).
+-vsn("0.6.1").
+
+% API
+-export([raw/0, get/1, send/1]).
+
+% includes
+-include("../include/misultin.hrl").
+
+
+% ============================ \/ API ======================================================================
+
+% Description: Returns raw websocket content.
+raw() ->
+	Ws.
+
+% Description: Get websocket info.
+get(socket) ->
+	Ws#ws.socket;
+get(socket_mode) ->
+	Ws#req.socket_mode;
+get(peer_addr) ->
+	Ws#ws.peer_addr;
+get(peer_port) ->
+	Ws#ws.peer_port;
+get(peer_cert) ->
+	Ws#ws.peer_cert;
+get(vsn) ->
+	Ws#ws.vsn;
+get(origin) ->
+	Ws#ws.origin;
+get(host) ->
+	Ws#ws.host;
+get(path) ->
+	Ws#ws.path;
+get(headers) ->
+	Ws#ws.headers.
+
+% send data
+send(Data) ->
+	SocketPid ! {send, Data}.
+		
+% ============================ /\ API ======================================================================
+
+
+
+% ============================ \/ INTERNAL FUNCTIONS =======================================================
+
+% ============================ /\ INTERNAL FUNCTIONS =======================================================

data/erlang/rebar.config

@@ -3,6 +3,8 @@
   "lib/bertio",
   "lib/bertrpc",
   "lib/emq",
+  "lib/ejson",
+  "lib/misultin",
   "lib/capricorn",
   "rel"
 ]}.

data/erlang/rel/overlay/etc/capricorn/app.config

@@ -4,6 +4,8 @@
 
     {cluster, [
       {database, "var/run/capricorn-cluster"},
+      
+      {console_port, 8756},
 
       {api, [
         % {stats, cap_service_stats}
@@ -21,6 +23,8 @@
     {machine, [
       % location of the cluster node
       {cluster, 'cluster@127.0.0.1'},
+      
+      {console_port, 8757},
 
       % path to gem repo
       {gems_path, "/opt/local/lib/ruby/gems/1.8"},

data/erlang/rel/reltool.config

@@ -5,10 +5,13 @@
     stdlib,
     sasl,
     inets,
+    
     bert,
     bertio,
     bertrpc,
     emq,
+    ejson,
+    misultin,
     capricorn,
 
     reltool,
@@ -23,6 +26,8 @@
   {app, bertio,    [{incl_cond, include}]},
   {app, bertrpc,   [{incl_cond, include}]},
   {app, emq,       [{incl_cond, include}]},
+  {app, ejson,     [{incl_cond, include}]},
+  {app, misultin,  [{incl_cond, include}]},
   {app, capricorn, [{incl_cond, include}]},
   {app, sasl,      [{incl_cond, include}]},
   {app, reltool,   [{incl_cond, include}]},

data/lib/capricorn/recipes/apache-debian.rb

@@ -21,7 +21,7 @@ has_db = application_root['shared/settings/database.yml'].exists?
 if application_root['host/'].exists?
   application_root.bash %{ mv host host-#{Time.now.strftime('%Y%m%d%H%M%S')} }
 end
-application_root.bash %{ milkshake create.host "host" --git-data --shared-data "shared" }
+application_root.bash %{ milkshake create:host "host" --git-data --shared-data "shared" }
 
 unless has_db
   ###############################################################################

data/lib/capricorn/recipes/centos-plesk.rb

@@ -78,7 +78,7 @@ has_db = application_root['shared/settings/database.yml'].exists?
 if application_root['host/'].exists?
   application_root.bash %{ mv host host-#{Time.now.strftime('%Y%m%d%H%M%S')} }
 end
-application_root.bash %{ milkshake create.host "host" --git-data --shared-data "shared" }
+application_root.bash %{ milkshake create:host "host" --git-data --shared-data "shared" }
 
 unless has_db
   ###############################################################################

data/lib/capricorn/recipes/debian-plesk95.rb

@@ -79,7 +79,7 @@ has_db = application_root['shared/settings/database.yml'].exists?
 if application_root['host/'].exists?
   application_root.bash %{ mv host host-#{Time.now.strftime('%Y%m%d%H%M%S')} }
 end
-application_root.bash %{ milkshake create.host "host" --git-data --shared-data "shared" }
+application_root.bash %{ milkshake create:host "host" --git-data --shared-data "shared" }
 
 unless has_db
   ###############################################################################
@@ -103,7 +103,6 @@ unless has_db
     password: #{db_pswd}
     host: localhost
     encoding: utf8
-    socket: /var/lib/mysql/mysql.sock
 
   development:
     <<: *default

data/lib/capricorn/recipes/macports.rb

@@ -13,7 +13,7 @@ application_root = capricorn_root[application[:id]+'/'].create
 if application_root['host/'].exists?
   application_root.bash %{ rm -rf host }
 end
-application_root.bash %{ milkshake create.host "host" --git-data --shared-data "shared" }
+application_root.bash %{ milkshake create:host "host" --git-data --shared-data "shared" }
 capricorn_root.bash %{ chown -R #{username}:staff "#{application_root.full_path}" }
 
 # create the vhost

data/lib/capricorn/version.rb

@@ -1,5 +1,5 @@
 module Capricorn
 
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 0
-  - 8
-  version: 2.0.8
+  - 9
+  version: 2.0.9
 platform: ruby
 authors: 
 - Simon Menke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - erlang/lib/capricorn/src/cap_cluster.erl
 - erlang/lib/capricorn/src/cap_cluster_gems.erl
 - erlang/lib/capricorn/src/cap_config.erl
+- erlang/lib/capricorn/src/cap_console_dispatcher.erl
 - erlang/lib/capricorn/src/cap_dets_updater.erl
 - erlang/lib/capricorn/src/cap_event_sup.erl
 - erlang/lib/capricorn/src/cap_events.erl
@@ -189,6 +190,23 @@ files:
 - erlang/lib/capricorn/src/cap_util.erl
 - erlang/lib/capricorn/src/capricorn.erl
 - erlang/lib/capricorn/src/capricorn_app.erl
+- erlang/lib/ejson/ebin/ejson.app
+- erlang/lib/ejson/include/ejson.hrl
+- erlang/lib/ejson/Makefile
+- erlang/lib/ejson/rebar.config
+- erlang/lib/ejson/src/ejson.erl
+- erlang/lib/ejson/src/ejson_decode.erl
+- erlang/lib/ejson/src/ejson_encode.erl
+- erlang/lib/ejson/test/arrays.escript
+- erlang/lib/ejson/test/compound.escript
+- erlang/lib/ejson/test/literals.escript
+- erlang/lib/ejson/test/numbers.escript
+- erlang/lib/ejson/test/objects.escript
+- erlang/lib/ejson/test/strings.escript
+- erlang/lib/ejson/test/timing.escript
+- erlang/lib/ejson/test/timing.json
+- erlang/lib/ejson/vendor/mochijson2.erl
+- erlang/lib/ejson/vendor/rfc4627.erl
 - erlang/lib/emq/ebin/emq.app
 - erlang/lib/emq/src/emq.erl
 - erlang/lib/emq/src/emq_app.erl
@@ -196,6 +214,35 @@ files:
 - erlang/lib/emq/src/emq_queue.erl
 - erlang/lib/emq/src/emq_status.erl
 - erlang/lib/emq/src/emq_sup.erl
+- erlang/lib/misultin/ebin/misultin.app
+- erlang/lib/misultin/examples/misultin_compress.erl
+- erlang/lib/misultin/examples/misultin_echo.erl
+- erlang/lib/misultin/examples/misultin_file.erl
+- erlang/lib/misultin/examples/misultin_gen_server.erl
+- erlang/lib/misultin/examples/misultin_get_variable.erl
+- erlang/lib/misultin/examples/misultin_hello_world.erl
+- erlang/lib/misultin/examples/misultin_rest.erl
+- erlang/lib/misultin/examples/misultin_ssl.erl
+- erlang/lib/misultin/examples/misultin_stream.erl
+- erlang/lib/misultin/examples/misultin_websocket_event_example.erl
+- erlang/lib/misultin/examples/misultin_websocket_example.erl
+- erlang/lib/misultin/include/misultin.hrl
+- erlang/lib/misultin/LICENSE.txt
+- erlang/lib/misultin/make.bat
+- erlang/lib/misultin/Makefile
+- erlang/lib/misultin/priv/README.txt
+- erlang/lib/misultin/priv/test_certificate.pem
+- erlang/lib/misultin/priv/test_privkey.pem
+- erlang/lib/misultin/README.txt
+- erlang/lib/misultin/rebar.config
+- erlang/lib/misultin/src/misultin.app.src
+- erlang/lib/misultin/src/misultin.erl
+- erlang/lib/misultin/src/misultin_http.erl
+- erlang/lib/misultin/src/misultin_req.erl
+- erlang/lib/misultin/src/misultin_socket.erl
+- erlang/lib/misultin/src/misultin_utility.erl
+- erlang/lib/misultin/src/misultin_websocket.erl
+- erlang/lib/misultin/src/misultin_ws.erl
 - erlang/rebar
 - erlang/rebar.config
 - erlang/rel/overlay/bin/capricornd