Skip to content

Commit 373f079

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 49ef027 + fc5c658 commit 373f079

File tree

17 files changed

+158
-292
lines changed

17 files changed

+158
-292
lines changed

‎.gitignore‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
# IDE Stuff
12
.settings
2-
logs/*.log
33
settings.xml
4-
.netbeans
4+
# Logs
5+
logs/*.log
6+
# Test Results
57
tests/results/*
6-
modules/cbvalidation/*
8+
# Dependenncies
79
coldbox/*
810
testbox/*
911
artifacts/*
1012
apidocs/docbox/*
11-
workbench/build.number
13+
workbench/*
1214
build/*

‎.module.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
project.name=cbdebugger
2+
project.version=1.5.0
3+
module.name=cbdebugger
4+
# Default CF Engine to Build With
5+
cfengine=[email protected]

‎.project‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 92 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,103 @@
11
language: java
2+
23
notifications:
34
slack:
45
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
6+
7+
env:
8+
global:
9+
- PROJECT_NAME=cbdebugger
10+
- MODULE_ID=cbdebugger
11+
- MODULE_VERSION=1.5.0
12+
matrix:
13+
- [email protected]
14+
- ENGINE=lucee@5
15+
- ENGINE=adobe@10
16+
- ENGINE=adobe@11
17+
- ENGINE=adobe@2016
18+
519
branches:
620
only:
721
- development
8-
sudo: required
22+
- master
23+
924
dist: trusty
25+
26+
sudo: required
27+
1028
before_install:
11-
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
12-
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
13-
/etc/apt/sources.list.d/commandbox.list
29+
# CommandBox Keys
30+
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
31+
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
32+
/etc/apt/sources.list.d/commandbox.list
33+
1434
install:
15-
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
16-
- box install
17-
- box server start
18-
before_script:
19-
# Startup the app
20-
- curl http://localhost:49616/
35+
# Install Commandbox
36+
- sudo apt-get update && sudo apt-get --assume-yes install git haveged rsync commandbox
37+
# Test that the box binary is available and ready for our tests
38+
- box version
39+
# If using auto-publish, you will need to provide your API token with this line:
40+
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
41+
# Setup for our tests
42+
- mkdir tests/results
43+
- sudo chmod -R 775 tests/results
44+
45+
# Build script - note module versioning is passed to ANT
2146
script:
22-
- ant -f workbench/build.xml
47+
# run our dependency install to ensure the workbench is in place
48+
- box install
49+
# add our module-specific build properties
50+
- printf "\nproject.version=$MODULE_VERSION" >> workbench/build.properties
51+
- printf "\nproject.name=$PROJECT_NAME" >> workbench/build.properties
52+
- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
53+
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
54+
# execute our build
55+
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
56+
57+
after_failure:
58+
- cd $TRAVIS_BUILD_DIR
59+
# Display the contents of our root directory
60+
# Spit out our Commandbox log in case we need to debug
61+
- box server log name=$ENGINE
62+
- cat `box system-log`
63+
64+
before_deploy:
65+
- cd $TRAVIS_BUILD_DIR
66+
- mkdir -p s3deploy
67+
- rsync -av ./artifacts/$PROJECT_NAME/ ./s3deploy/
68+
- rm -f ./s3deploy/box-repo.json
69+
70+
deploy:
71+
#Module Deployment
72+
- provider: s3
73+
on:
74+
branch:
75+
- master
76+
- development
77+
condition: "$ENGINE = [email protected]"
78+
skip_cleanup: true
79+
#AWS Credentials need to be set in Travis
80+
access_key_id: $AWS_ACCESS_KEY
81+
secret_access_key: $AWS_ACCESS_SECRET
82+
bucket: "downloads.ortussolutions.com"
83+
local-dir: s3deploy
84+
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
85+
acl: public_read
86+
#API Docs Deployment
87+
- provider: s3
88+
on:
89+
branch:
90+
- master
91+
condition: "$ENGINE = [email protected]"
92+
skip_cleanup: true
93+
#AWS Credentials need to be set in Travis
94+
access_key_id: $AWS_ACCESS_KEY
95+
secret_access_key: $AWS_ACCESS_SECRET
96+
bucket: "apidocs.ortussolutions.com"
97+
local-dir: build/apidocs
98+
upload-dir: coldbox-modules/$MODULE_ID
99+
acl: public_read
100+
101+
102+
after_deploy:
103+
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish

‎apidocs/box.json‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,15 @@
11
{
22
"name":"API Docs",
33
"version":"1.0.0",
4-
"author":"",
5-
"location":"",
6-
"directory":"",
7-
"createPackageDirectory":true,
8-
"packageDirectory":"",
9-
"homepage":"",
10-
"documentation":"",
11-
"repository":{
12-
"type":"",
13-
"URL":""
14-
},
15-
"bugs":"",
164
"slug":"module-apidocs",
17-
"shortDescription":"",
18-
"description":"",
19-
"instructions":"",
20-
"changelog":"",
21-
"type":"",
22-
"keywords":[
23-
24-
],
255
"private":true,
26-
"engines":[
27-
{
28-
"type":"",
29-
"version":""
30-
}
31-
],
32-
"defaultEngine":"",
33-
"projectURL":"",
34-
"license":[
35-
{
36-
"type":"",
37-
"URL":""
38-
}
39-
],
40-
"contributors":[
41-
42-
],
436
"dependencies":{
44-
"docbox":"https://github.com/Ortus-Solutions/DocBox/archive/v2.0.4.zip"
7+
"docbox":"^2.0.7+00005"
458
},
469
"devDependencies":{
4710

4811
},
4912
"installPaths":{
5013
"docbox":"docbox"
51-
},
52-
"ignore":[
53-
"**/.*",
54-
"tests"
55-
],
56-
"testbox":{
57-
"runner":[
58-
{
59-
"default":""
60-
}
61-
],
62-
"labels":[
63-
64-
],
65-
"reporter":"",
66-
"reporterResults":"",
67-
"bundles":[
68-
""
69-
],
70-
"directory":{
71-
"mapping":"",
72-
"recurse":true
73-
},
74-
"watchers":[
75-
76-
],
77-
"notify":{
78-
"emails":[
79-
80-
],
81-
"growl":"",
82-
"URL":""
83-
}
8414
}
8515
}

‎box.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
"private":false,
66
"defaultPort":0,
77
"dependencies":{
8-
"coldbox":"be"
8+
"coldbox":"^4.3.0",
9+
"workbench":"git+https://github.com/Ortus-Solutions/unified-workbench.git"
910
},
1011
"devDependencies":{
1112
"testbox":"2.3.0+00044"
1213
},
1314
"installPaths":{
1415
"testbox":"testbox",
15-
"coldbox":"coldbox"
16+
"coldbox":"coldbox",
17+
"workbench":"workbench"
1618
}
1719
}

‎changelog.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
CHANGELOG
22
=========
33

4+
## 1.5.0
5+
* Case-Sensitive filesystems fix
6+
* Updated travis builds
7+
* Unified workbench approach
8+
49
## 1.4.0
5-
# ColdBox Tracer Appender added by Default by Eric Peterson
10+
* ColdBox Tracer Appender added by Default by Eric Peterson
611

712
## 1.3.0
813
* Travis integration

‎modules/cbdebugger/ModuleConfig.cfc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ component {
1010
this.author = "Curt Gratz - Ortus Solutions";
1111
this.webURL = "http://www.ortussolutions.com";
1212
this.description = "The ColdBox Debugger Module";
13-
this.version = "@version.number@[email protected]@";
13+
this.version = "@build.version@[email protected]@";
1414
// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
1515
this.viewParentLookup = true;
1616
// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
@@ -122,7 +122,7 @@ component {
122122
if( !findNoCase( "4.3", controller.getSetting( "version", true ) ) ){
123123
return;
124124
}
125-
logBox.registerAppender( 'tracer', 'cbdebugger.includes.appenders.ColdBoxTracerAppender' );
125+
logBox.registerAppender( 'tracer', 'cbdebugger.includes.appenders.ColdboxTracerAppender' );
126126
var appenders = logBox.getAppendersMap( 'tracer' );
127127
// Register the appender with the root loggger, and turn the logger on.
128128
var root = logBox.getRootLogger();

‎modules/cbdebugger/box.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name" : "ColdBox Debugger",
33
"author" : "Ortus Solutions <[email protected]",
4-
"location" : "http://downloads.ortussolutions.com.s3.amazonaws.com/ortussolutions/coldbox-modules/cbdebugger/@version.number@/cbdebugger-@version.number@.zip",
5-
"version" : "@version.number@[email protected]@",
4+
"location" : "http://downloads.ortussolutions.com.s3.amazonaws.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/cbdebugger-@build.version@.zip",
5+
"version" : "@build.version@[email protected]@",
66
"slug" : "cbdebugger",
77
"type" : "modules",
88
"homepage" : "https://github.com/coldbox-modules/cbox-debugger",

‎modules/cbdebugger/includes/appenders/ColdboxTracerAppender.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Description :
1515
hint="An appender that interfaces with the ColdBox Tracer Panel">
1616

1717
<!--- Init --->
18-
<cffunction name="init" access="public" returntype="ColdBoxTracerAppender" hint="Constructor" output="false" >
18+
<cffunction name="init" access="public" returntype="ColdboxTracerAppender" hint="Constructor" output="false" >
1919
<!--- ************************************************************* --->
2020
<cfargument name="name" required="true" hint="The unique name for this appender."/>
2121
<cfargument name="properties" required="false" default="#structnew()#" hint="A map of configuration properties for the appender"/>

0 commit comments

Comments
 (0)