repo
string
commit
string
message
string
diff
string
calca/Mum
99405cc2192d0bbd4dc6c81855aede651ab89f04
Port to pygtk 2.10
diff --git a/src/ChangeLog b/src/ChangeLog index a52a36f..7b7dd95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,337 +1,358 @@ +2006-12-29 gianluigi.calcaterra@gmail.com + + * port to pygtk 2.10 + +2004-12-22 Gianluigi Calcaterra <gianluigi.calcaterra@milug.org> + + * lib/update_ftp_index.py (update_ftp_index...
calca/Mum
edff02ca3d7dc6e9bbb33e7e54ad18423fd174b1
Port to new gtk.gdk.threads
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 40e8d5c..0000000 --- a/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -gianlugi calcaterra <gianluigi.calcaterra@gmail.com> diff --git a/TODO b/TODO deleted file mode 100644 index e69de29..0000000 diff --git a/src/AUTHORS b/src/AUTHORS index d71172e..cb2eb27 100644 ---...
diogok/JobJoker
1b7a9da16c6bd8145721d1c41646946168da47e2
fixed parameters set to obj intead of array
diff --git a/libs/Worker.php b/libs/Worker.php index a99b558..dd58948 100644 --- a/libs/Worker.php +++ b/libs/Worker.php @@ -1,114 +1,114 @@ <?php include_once 'restserver/RestClient.class.php'; define("DONE",'done'); define("ERROR",'error'); define("ACTIVE",'active'); define("STOP",'stop'); define("IDLE",'i...
diogok/JobJoker
8a76d0848e85a8502b4a95a2852a256d5c03a881
added the .htaccess
diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..01d36a0 --- /dev/null +++ b/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine on +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ index.php?q=/$1
diogok/JobJoker
2db5ce956124cb34343565451bcb70b326f4054a
little crop on screenshots
diff --git a/libs/imgs/jj-1.png b/libs/imgs/jj-1.png index a3345d6..fc63a8f 100644 Binary files a/libs/imgs/jj-1.png and b/libs/imgs/jj-1.png differ diff --git a/libs/imgs/jj-2.png b/libs/imgs/jj-2.png index 008dd75..6855ebd 100644 Binary files a/libs/imgs/jj-2.png and b/libs/imgs/jj-2.png differ diff --git a/libs/imgs...
pronix/tyroper
7803b17b1a6044068b54ff04238a13d924522ef8
add uml plugin
diff --git a/diagrams/model_Aug_24_2009.png b/diagrams/model_Aug_24_2009.png new file mode 100644 index 0000000..b1f1298 Binary files /dev/null and b/diagrams/model_Aug_24_2009.png differ diff --git a/vendor/plugins/yUMLmeRails/README.markdown b/vendor/plugins/yUMLmeRails/README.markdown new file mode 100644 index 0000...
pronix/tyroper
b6c48b154da08abde28686d639a12808f99651d7
add check city for hotel and error report if it not exist
diff --git a/app/controllers/hotel_controller.rb b/app/controllers/hotel_controller.rb index 40feffc..8be4189 100644 --- a/app/controllers/hotel_controller.rb +++ b/app/controllers/hotel_controller.rb @@ -1,24 +1,28 @@ class HotelController < ApplicationController auto_complete_for :city, :name def index @hot...
pronix/tyroper
e929715acd3d2958cfe9fd0402a56a7dde5ee73e
add ignore log
diff --git a/.gitignore b/.gitignore index fc6fa6e..8d59f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.log *.swp +log/* +log/development.log
pronix/tyroper
b7c994ba9104c0627d1d74be616b4e1dfb29a687
fix little bug
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc6fa6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.log +*.swp diff --git a/app/controllers/tourist_controller.rb b/app/controllers/tourist_controller.rb old mode 100644 new mode 100755 index 4fe03e3..a1d41da --- a/app/controllers/tourist_co...
pronix/tyroper
e3eb0e1cd5eda88e472c28f01b174e712a7c8408
tourist edit check
diff --git a/app/controllers/tourist_controller.rb b/app/controllers/tourist_controller.rb index 858028a..4fe03e3 100644 --- a/app/controllers/tourist_controller.rb +++ b/app/controllers/tourist_controller.rb @@ -1,35 +1,41 @@ class TouristController < ApplicationController def index - #@tourists = Tourist.find(...
danwoods/Setr.us
7110c2ffa3df1030df8e84947788355cb905b9db
Fixed encore draggability issue
diff --git a/javascript/playlist.js b/javascript/playlist.js index 2f0940a..548758a 100755 --- a/javascript/playlist.js +++ b/javascript/playlist.js @@ -1,606 +1,607 @@ /****************************************** * Filename: playlist.js * Description: javascript functions pertaining to the playlist * To-Do: Cl...
danwoods/Setr.us
324f579b037119b13d3b95f684ec26f1831d40fb
improved error checking in catalouge.js, further reorganized getSongs.php to not throw error when no songs are found
diff --git a/javascript/catalogue.js b/javascript/catalogue.js index cd7e1a7..15588b0 100755 --- a/javascript/catalogue.js +++ b/javascript/catalogue.js @@ -1,587 +1,589 @@ /******************** * This file contains functions which pertain to accordian-style * the catalouge of music * * Author: Dan Woodson ...
danwoods/Setr.us
7d3c202fd950f9063d1bf5b74e6f2b677f9dfadb
Added basic error handling to catalouge.js and reorganized getSongs.php to make error detection and handling easier
diff --git a/index.php b/index.php index c7c1d04..fa490b6 100755 --- a/index.php +++ b/index.php @@ -1,127 +1,126 @@ <?php session_start(); if(!isset($_SESSION['username'])){ header('Location: login_html.php'); } ?> <!DOCTYPE html PUBLIC "-//w3c//DTD XHTML 1.1//EN" "HTTP://www.w3c.org/TR/xhtml11/DTD/xh...
danwoods/Setr.us
ef5c720b0e5332f592de5ecc3638fa218057a76c
Fixed an unneccessay call which was throwing an error
diff --git a/javascript/playlist.js b/javascript/playlist.js index 76a8a3c..2f0940a 100755 --- a/javascript/playlist.js +++ b/javascript/playlist.js @@ -1,523 +1,522 @@ /****************************************** * Filename: playlist.js * Description: javascript functions pertaining to the playlist * To-Do: Cl...
danwoods/Setr.us
bfd97456bfab2c2bc5c7d9623140814cc1c5d0eb
added todo.txt file
diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000..7849c49 --- /dev/null +++ b/todo.txt @@ -0,0 +1,4 @@ +Fix Phish hang-up +Fix whole show dragging +Create .js file to handle common things around the site (ie: error class) and place it in every header file +
danwoods/Setr.us
f069fdf5c34ddefa5c28bf3c3202fe1bc5a9ca92
Various changes. Restarting development, this is the current version on my machine
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..65eef93 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +db diff --git a/flashplayer/current/music_player.fla b/flashplayer/current/music_player.fla new file mode 100644 index 0000000..516f4ca Binary files /dev/null and b/flashplayer/current/music_pl...
danwoods/Setr.us
716e9eb37b7fa7677923daa15c12ce6a6e8d25e8
[Local] Login page now auto focuses on the username
diff --git a/login_html.php b/login_html.php index b4ef4cc..e102973 100755 --- a/login_html.php +++ b/login_html.php @@ -1,179 +1,182 @@ <?php if(isset($_SESSION['username'])){ header('Location: index.php'); } ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD...
danwoods/Setr.us
1ae4967e432532862dd666cfc0e8d97ffa6a3ec4
[Local] In uploader, made "Optional Information" hide if header is clicked while open. Also setup Optional Info header to change signs (+/-) based on wether it's visible or not
diff --git a/music/uploader/uploaderFrontEnd.php b/music/uploader/uploaderFrontEnd.php index a08bdc5..4e1b818 100644 --- a/music/uploader/uploaderFrontEnd.php +++ b/music/uploader/uploaderFrontEnd.php @@ -1,1056 +1,1067 @@ <?php session_start(); if(!isset($_SESSION['username'])){ header('Location: http://localho...
danwoods/Setr.us
d8b1d15b13f3ce144f5cb255d6cc10c9b440075d
[Local] Formatting of scripts
diff --git a/javascript/playlist.js b/javascript/playlist.js index 31cc6fd..4432929 100755 --- a/javascript/playlist.js +++ b/javascript/playlist.js @@ -1,518 +1,518 @@ /****************************************** * Filename: playlist.js * Description: javascript functions pertaining to the playlist - * To-Do: re...
danwoods/Setr.us
e15fe278b41484e3cbc95bd4efcd2d24aa6c74e2
[Local] Polished files used in song flashing/pulsing
diff --git a/javascript/music_player.js b/javascript/music_player.js index db66798..0d50d18 100755 --- a/javascript/music_player.js +++ b/javascript/music_player.js @@ -1,168 +1,167 @@ //use the following function as such //thisMovie("music_player").nameofflashfunction(para); // var highlight; ...
danwoods/Setr.us
3a34249ad269c32bc0f9ac879604aaeaf4a54e25
[Local] Fixed song pulsing while playing
diff --git a/javascript/music_player.js b/javascript/music_player.js index 1bcd341..db66798 100755 --- a/javascript/music_player.js +++ b/javascript/music_player.js @@ -1,160 +1,168 @@ //use the following function as such //thisMovie("music_player").nameofflashfunction(para); // -var highlight; ...
danwoods/Setr.us
11c841f6508b006b7c2298e316053a20bc39788e
[Local] Made currently playing song pulse, need to make it re-set background color on finish
diff --git a/javascript/music_player.js b/javascript/music_player.js index 731a498..1bcd341 100755 --- a/javascript/music_player.js +++ b/javascript/music_player.js @@ -1,158 +1,160 @@ //use the following function as such //thisMovie("music_player").nameofflashfunction(para); // var highlight; ...
danwoods/Setr.us
dfe0080b43895b5db7ebd8f366d444f00fc539f7
[Local] Edited updater and database linkage
diff --git a/music/uploader/getBands.php b/music/uploader/getBands.php index 4be938f..3f090a1 100644 --- a/music/uploader/getBands.php +++ b/music/uploader/getBands.php @@ -1,50 +1,55 @@ <?php ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); header('Content-Type: text/xml'); +//include database...
danwoods/Setr.us
50341b93f66977b9fcf83889875a10a99cc383d6
[Local] Fixed song name input positioning/width in uploader
diff --git a/music/uploader/uploaderFrontEnd.php b/music/uploader/uploaderFrontEnd.php index 8daf62f..234869f 100644 --- a/music/uploader/uploaderFrontEnd.php +++ b/music/uploader/uploaderFrontEnd.php @@ -511,546 +511,546 @@ if(!isset($_SESSION['username'])){ 'showId': showId, 'artist': full_b...
danwoods/Setr.us
b56efd00bcd6bc3e60422a15c4e067a39ce9efc6
[Local] Fixed positioning of show location inputs in uploader
diff --git a/music/uploader/uploaderFrontEnd.php b/music/uploader/uploaderFrontEnd.php index 6f156b0..8daf62f 100644 --- a/music/uploader/uploaderFrontEnd.php +++ b/music/uploader/uploaderFrontEnd.php @@ -1,1351 +1,1056 @@ <?php session_start(); if(!isset($_SESSION['username'])){ header('Location: http://localho...
danwoods/Setr.us
d402fe1556a0512e42c196316563d61a589190b5
[Local] added music/uploader directory
diff --git a/index.php b/index.php index b12e114..8b7b047 100755 --- a/index.php +++ b/index.php @@ -1,127 +1,127 @@ <?php session_start(); if(!isset($_SESSION['username'])){ header('Location: login_html.php'); } ?> <!DOCTYPE html PUBLIC "-//w3c//DTD XHTML 1.1//EN" "HTTP://www.w3c.org/TR/xhtml11/DTD/xh...
danwoods/Setr.us
617e9ceea9a1a3775ec187686b0c3334e99ad001
[Local] Fixed problem of qtips not showing on repeated hover/mouseover/mouseenter. Now catalogue.js re-creates the qTip each time.
diff --git a/javascript/catalogue.js b/javascript/catalogue.js index f71d728..2436c68 100755 --- a/javascript/catalogue.js +++ b/javascript/catalogue.js @@ -1,593 +1,592 @@ /******************** * This file contains functions which pertain to accordian-style * the catalouge of music * * Author: Dan Woodson ...
danwoods/Setr.us
ef2015cc651928182ee32ab0c04282243db348f3
[Local] Fixed document page titles, ie: Set.r > Setr.us
diff --git a/index.php b/index.php index 058fc94..b12e114 100755 --- a/index.php +++ b/index.php @@ -1,127 +1,127 @@ <?php session_start(); if(!isset($_SESSION['username'])){ header('Location: login_html.php'); } ?> <!DOCTYPE html PUBLIC "-//w3c//DTD XHTML 1.1//EN" "HTTP://www.w3c.org/TR/xhtml11/DTD/xh...
danwoods/Setr.us
d7d7f23d04b53e63cff19491d4c8faf061f8fb1b
[Local] Fixed logout page linkage
diff --git a/index.php b/index.php index 287f82c..058fc94 100755 --- a/index.php +++ b/index.php @@ -1,127 +1,127 @@ <?php session_start(); if(!isset($_SESSION['username'])){ header('Location: login_html.php'); } ?> <!DOCTYPE html PUBLIC "-//w3c//DTD XHTML 1.1//EN" "HTTP://www.w3c.org/TR/xhtml11/DTD/xh...
danwoods/Setr.us
69684fac86faa9956b6732b29fe099230425774e
[Local] Edited getArtist.php to only retuen artist with > 0 shows
diff --git a/php/getArtists.php b/php/getArtists.php index 32c7d2e..43f1f5a 100755 --- a/php/getArtists.php +++ b/php/getArtists.php @@ -1,63 +1,64 @@ <?php //turn on error reporting, set header header('Content-Type: text/xml'); ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); +//include dat...
danwoods/Setr.us
204bf5cf8a3cfd6bfdac9128effe9c99d89e3572
[Local] Finished polishing up p_songInfoRetrevial.php. Problem with multiple shows not returning all encores should now be totally fixed.
diff --git a/php/getYears.php b/php/getYears.php index 636cf01..8060de9 100755 --- a/php/getYears.php +++ b/php/getYears.php @@ -1,72 +1,72 @@ <?php //turn on error reporting, set header header('Content-Type: text/xml'); ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); -//pull variables, esc...
danwoods/Setr.us
f7b8c20a3e660780f3037699905f06aa21c61a94
Fixed problem of playlist not adding full encores when multiple shows are added
diff --git a/php/p_songInfoRetrevial.php b/php/p_songInfoRetrevial.php index dcd880b..ecaf9d4 100755 --- a/php/p_songInfoRetrevial.php +++ b/php/p_songInfoRetrevial.php @@ -1,153 +1,149 @@ <?php -###CURRENTLY WORKING ON RETURNING MULTIPLE SETS OF SONGS### -//remove comment qoutes and test with xml.php //turn on error...
danwoods/Setr.us
04bfc20325883d0b8693109a8a2942a7ce38529a
[LOCAL] added slashes in artistToAbb.php
diff --git a/login_html.php b/login_html.php index b89e654..8e33c53 100755 --- a/login_html.php +++ b/login_html.php @@ -1,179 +1,179 @@ <?php if(isset($_SESSION['username'])){ header('Location: index.php'); } ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD...
danwoods/Setr.us
91d1dbc33cd59944a4f1f68d21f116b8ef8905f0
further corrections to database linkage
diff --git a/php/showXmlToHtml.php b/php/showXmlToHtml.php index dae1806..6fcecec 100755 --- a/php/showXmlToHtml.php +++ b/php/showXmlToHtml.php @@ -1,58 +1,56 @@ <?php //turn on error reporting, set header header('Content-Type: text/xml'); ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); /...
danwoods/Setr.us
e5e2d36dc4ecf7189b8cd2e0b642e3ca3bbcf19f
properly directed db login file linkage and removed actual db login file from repo
diff --git a/db/db_login.php b/db/db_login.php deleted file mode 100755 index 52f67f5..0000000 --- a/db/db_login.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php - $db_host = 'internal-db.s87280.gridserver.com'; - $db_database = 'db87280_setr_us'; - $db_username = 'db87280'; - $db_pass = 'pan1ccdb'; -?> diff --git a/php/artist...
danwoods/Setr.us
a34c4f9b23ace9a17c128f8453751ab5b61c3bc5
required update from server
diff --git a/db/db_login.php b/db/db_login.php index bed1222..52f67f5 100644 --- a/db/db_login.php +++ b/db/db_login.php @@ -1,6 +1,6 @@ <?php $db_host = 'internal-db.s87280.gridserver.com'; $db_database = 'db87280_setr_us'; $db_username = 'db87280'; - $db_pass = 'pan1ccmt'; + $db_pass = 'pan1ccdb'; ?>
danwoods/Setr.us
7212adade7e99d82e850f887209b79a833c8b82c
changed all files in /php to use /db/db_login.php
diff --git a/db/db_login.php b/db/db_login.php old mode 100644 new mode 100755 diff --git a/php/login.php b/php/login.php index 1f7e54d..29cd302 100755 --- a/php/login.php +++ b/php/login.php @@ -1,63 +1,63 @@ <?php //turn on error reporting, set header ini_set('display_errors', 'On'); error_reporting(E_ALL | E_S...
danwoods/Setr.us
71620803882ce2a2b92f310fe6a083066884164f
changed all files in /php to use /db/db_login.php
diff --git a/php/artistToAbb.php b/php/artistToAbb.php index e26f541..f48a035 100755 --- a/php/artistToAbb.php +++ b/php/artistToAbb.php @@ -1,40 +1,46 @@ <?php ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); header('Content-Type: text/plain'); +include('db/db_login.php'); + //connect with d...
danwoods/Setr.us
3df34a4693fb006d1e68dc22051014884fd828d4
SERVER: fixed error in file linkage
diff --git a/db/db_login.php b/db/db_login.php index 32aa9a1..bed1222 100644 --- a/db/db_login.php +++ b/db/db_login.php @@ -1,6 +1,6 @@ <?php - $db_host = 'localhost'; - $db_database = 'musicneverstopped'; - $db_username = 'root'; - $db_pass = ''; + $db_host = 'internal-db.s87280.gridserver.com'; + $db_database = 'db...
danwoods/Setr.us
6add4317c0cc890db26fcb6f0b3b7986d7a216f9
added db directory to hold common database information/files
diff --git a/db/db_login.php b/db/db_login.php new file mode 100644 index 0000000..32aa9a1 --- /dev/null +++ b/db/db_login.php @@ -0,0 +1,6 @@ +<?php + $db_host = 'localhost'; + $db_database = 'musicneverstopped'; + $db_username = 'root'; + $db_pass = ''; +?> diff --git a/index.html b/index.html index 384adf6..3933507 ...
danwoods/Setr.us
69a67dbcdc58a18f806f1a38b66f88a914863449
re-directed in-site links from musicneverstopped to Setr.us
diff --git a/index.html b/index.html index 6dd43de..384adf6 100755 --- a/index.html +++ b/index.html @@ -1,6 +1,6 @@ <html> <head> -<script>location='http://localhost/musicneverstopped/index.php'</script> +<script>location='http://localhost/Setr.us/index.php'</script> <body> </body> </html> diff --git a/index.php ...
danwoods/Setr.us
6dec6c9d4123b987085f6255c4319b4b76ac4979
fixed set spacing problem in music catalog
diff --git a/stylesheets/results.css b/stylesheets/results.css index 0624bb6..a08f24f 100755 --- a/stylesheets/results.css +++ b/stylesheets/results.css @@ -1,574 +1,574 @@ /*catalogue styles*/ * { margin: 0; padding: 0; } h1{ display: inline; font-size: .80em; position: relative; /*bottom: 10%;...
danwoods/Setr.us
6fcc9424e82e84921720d131d48cd715cfdcfb55
some more files for initial add
diff --git a/login_html.php b/login_html.php new file mode 100755 index 0000000..b89e654 --- /dev/null +++ b/login_html.php @@ -0,0 +1,179 @@ +<?php +if(isset($_SESSION['username'])){ + header('Location: index.php'); + } +?> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml...
Ronmi/ronmi.github.com
a88ca410a8e77dc5eac8c25c432427d16742e6e6
fix typo
diff --git a/categories/docker/index.html b/categories/docker/index.html index 4b33754..dd0c86b 100644 --- a/categories/docker/index.html +++ b/categories/docker/index.html @@ -1,284 +1,284 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>程式、雜談</title> - <meta name="autho...
Ronmi/ronmi.github.com
555d498dff4295f8dd8a5253699718c7e3dc0199
fix https
diff --git a/about/index.html b/about/index.html index de3cba4..4bedf1e 100644 --- a/about/index.html +++ b/about/index.html @@ -1,260 +1,260 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>關於 - 程式、雜談</title> <meta name="author" content="map[name:Ronmi Ren email:ro...
Ronmi/ronmi.github.com
7506a34f3513e876acd9194c2b91f2f36d632e10
fix disqus
diff --git a/about/index.html b/about/index.html index 82f201e..de3cba4 100644 --- a/about/index.html +++ b/about/index.html @@ -1,260 +1,260 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>關於 - 程式、雜談</title> <meta name="author" content="map[name:Ronmi Ren email:ro...
Ronmi/ronmi.github.com
52b357577d09be0a5898a566d70819eafb7a6142
fix https
diff --git a/about/index.html b/about/index.html index 2618265..82f201e 100644 --- a/about/index.html +++ b/about/index.html @@ -1,260 +1,260 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>關於 - 程式、雜談</title> - <meta name="author" content="map[email:ronmi.ren@gmail.c...
Ronmi/ronmi.github.com
69952fcc70bc726958597e707bd1fed09dfa44c9
add disqus
diff --git a/about/index.html b/about/index.html index 67067c2..3081c35 100644 --- a/about/index.html +++ b/about/index.html @@ -1,214 +1,236 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>關於 - 程式、雜談</title> - <meta name="author" content="map[name:Ronmi Ren email:ro...
Ronmi/ronmi.github.com
8958d9ad402e4456161082e162dffbc75d299f24
change to slide
diff --git a/about/index.html b/about/index.html index 3be7145..67067c2 100644 --- a/about/index.html +++ b/about/index.html @@ -1,214 +1,214 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>關於 - 程式、雜談</title> <meta name="author" content="map[name:Ronmi Ren email:ro...
Ronmi/ronmi.github.com
8e38a9c22bdae74db1097452789e0a0ce49f3da2
fix simple rwd
diff --git a/about/index.html b/about/index.html index cc060ba..3be7145 100644 --- a/about/index.html +++ b/about/index.html @@ -1,214 +1,214 @@ <!DOCTYPE HTML> <html lang="zh-tw"> <head> <meta charset="utf-8"> <title>關於 - 程式、雜談</title> <meta name="author" content="map[name:Ronmi Ren email:ro...
Ronmi/ronmi.github.com
0d2cfdef200f1771ac362245a4376a3360e7fdd4
fix baseurl
diff --git a/categories/index.html b/categories/index.html index 436b74e..31033f4 100644 --- a/categories/index.html +++ b/categories/index.html @@ -1,84 +1,84 @@ <!DOCTYPE html> <html lang="zh-tw"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta name="viewport" content...
dchelimsky/rspec-tmbundle
7d832113c723e4b0fab38d7172ba70ec3d4c08c1
Move dev to http://github.com/rspec/rspec-tmbundle
diff --git a/Commands/Alternate File.tmCommand b/Commands/Alternate File.tmCommand deleted file mode 100644 index 284cba0..0000000 --- a/Commands/Alternate File.tmCommand +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/D...
dchelimsky/rspec-tmbundle
df85d0cee8352faada65b80cf490b11d7e0a9530
Fixed bug where Cmd + R fails in a Ruby-script (no matter if RSpec is a dependency or not) when only single file is loaded (aka "standalone mode"). Closes #5.
diff --git a/Support/lib/spec/mate.rb b/Support/lib/spec/mate.rb index 715db37..6d0ce89 100644 --- a/Support/lib/spec/mate.rb +++ b/Support/lib/spec/mate.rb @@ -1,18 +1,20 @@ # This is based on Florian Weber's TDDMate require 'rubygems' +ENV['TM_PROJECT_DIRECTORY'] ||= File.dirname(ENV['TM_FILEPATH']) rspec_rails_...
dchelimsky/rspec-tmbundle
290062c57462ff4640cc9c474b74e47a50206904
better spec_helper snippet (reqs)
diff --git a/Snippets/Require spec_helper.tmSnippet b/Snippets/Require spec_helper.tmSnippet index 920025a..56062e9 100644 --- a/Snippets/Require spec_helper.tmSnippet +++ b/Snippets/Require spec_helper.tmSnippet @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1....
dchelimsky/rspec-tmbundle
b93a56c1f6b56c71e744d117e35c71552fddd172
Fixed bug that was crashing twin file generation
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 5db939a..960b4c1 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,139 +1,165 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
8c91306e1e4046c99b90b9f698403c39a05137fa
open file before telling apple script to write to it
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 1e8d588..5db939a 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,142 +1,139 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
d861dbaf5281eec54422315a9ffdcdfa6a594b84
Made 'Save Example file and remember' command TM_RUBY aware.
diff --git a/Commands/Save spec and remember.tmCommand b/Commands/Save spec and remember.tmCommand index 2bb2142..f2292f4 100644 --- a/Commands/Save spec and remember.tmCommand +++ b/Commands/Save spec and remember.tmCommand @@ -1,29 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//...
dchelimsky/rspec-tmbundle
22fbfb6f703889e75a105b09b30286cc25648518
better snippet for define matcher
diff --git a/Snippets/Matcher (DSL).tmSnippet b/Snippets/Matcher (DSL).tmSnippet index d402541..1fab14d 100644 --- a/Snippets/Matcher (DSL).tmSnippet +++ b/Snippets/Matcher (DSL).tmSnippet @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple...
dchelimsky/rspec-tmbundle
46469f727985efc1605ed6a5c94bc21a1c7f040f
add Spec::Runner.configure snippet (cnf)
diff --git a/Snippets/configure.tmSnippet b/Snippets/configure.tmSnippet new file mode 100644 index 0000000..ebe8376 --- /dev/null +++ b/Snippets/configure.tmSnippet @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0...
dchelimsky/rspec-tmbundle
7a96fb6570a86d3fba516e8b6691b86515e8cfb7
whitespace
diff --git a/README.rdoc b/README.rdoc index db6e07a..2cccb7e 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,12 +1,11 @@ == History Parts of RSpec.tmbundle is based on Florian Weber's TDDMate. == License The license of RSpec.tmbundle is the same as RSpec's. == Installation -cd ~/Library/Application\ Support/...
dchelimsky/rspec-tmbundle
59fdb28c2781830f06d56c0af59522631d446894
require 'spec/autorun'
diff --git a/Support/lib/spec/mate.rb b/Support/lib/spec/mate.rb index 0d102fb..715db37 100644 --- a/Support/lib/spec/mate.rb +++ b/Support/lib/spec/mate.rb @@ -1,18 +1,18 @@ # This is based on Florian Weber's TDDMate require 'rubygems' rspec_rails_plugin = File.join(ENV['TM_PROJECT_DIRECTORY'],'vendor','plugins',...
dchelimsky/rspec-tmbundle
5d2551c0265b709bd13e7731e7f36cc5b8ecc57f
handle spaces in paths
diff --git a/Support/lib/spec/mate/runner.rb b/Support/lib/spec/mate/runner.rb index 289c689..373b493 100644 --- a/Support/lib/spec/mate/runner.rb +++ b/Support/lib/spec/mate/runner.rb @@ -1,66 +1,66 @@ module Spec module Mate class Runner def run_files(stdout, options={}) - files = ENV['TM_SELEC...
dchelimsky/rspec-tmbundle
0db15433157556c7ee169d5c615d0d743994927a
added specify keyword
diff --git a/Syntaxes/RSpec.tmLanguage b/Syntaxes/RSpec.tmLanguage index dd20f84..d17512b 100644 --- a/Syntaxes/RSpec.tmLanguage +++ b/Syntaxes/RSpec.tmLanguage @@ -1,183 +1,183 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.d...
dchelimsky/rspec-tmbundle
b6f62fb426005a5e0e6368076e330f27d93ad288
Add new Matcher DSL snippet
diff --git a/Snippets/Custom Matcher.tmSnippet b/Snippets/Matcher (Custom).tmSnippet similarity index 76% rename from Snippets/Custom Matcher.tmSnippet rename to Snippets/Matcher (Custom).tmSnippet index 7cff359..802da99 100644 --- a/Snippets/Custom Matcher.tmSnippet +++ b/Snippets/Matcher (Custom).tmSnippet @@ -1,39...
dchelimsky/rspec-tmbundle
874cd73f71409c7b99eaa4349c8fdb6a1e6e6328
added support for single-line example 'it { should be_true }'
diff --git a/Syntaxes/RSpec.tmLanguage b/Syntaxes/RSpec.tmLanguage index ee46398..dd20f84 100644 --- a/Syntaxes/RSpec.tmLanguage +++ b/Syntaxes/RSpec.tmLanguage @@ -1,166 +1,183 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.d...
dchelimsky/rspec-tmbundle
a8a1ad3ea0c4bcfc82424f09debdb7a0620ed57f
When saving a _spec.rb example file, it is remembered, and 'Run last example file' command (Alt+Cmd+R) in any normal Ruby file will execute it like the other 'Run examples' commands
diff --git a/Commands/Run Last Examples file.tmCommand b/Commands/Run Last Examples file.tmCommand new file mode 100644 index 0000000..eaddfca --- /dev/null +++ b/Commands/Run Last Examples file.tmCommand @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "ht...
dchelimsky/rspec-tmbundle
a02391e130ca7813fd986453104515072efe4404
SwitchCommand#create? handles spaces in ENV['TM_SUPPORT_PATH']
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index d1c1084..1e8d588 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,142 +1,142 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
26c53d2acf10c0ee3689cbd67ab1af54b6a56998
added installation instructions to README and formatted README as rdoc
diff --git a/README b/README deleted file mode 100644 index 02fc099..0000000 --- a/README +++ /dev/null @@ -1,11 +0,0 @@ -Parts of RSpec.tmbundle are based on Florian Weber's TDDMate. - -=== INSTALL - -cd ~/Library/Application\ Support/TextMate/Bundles/ -git clone git://github.com/dchelimsky/rspec-tmbundle.git RSpec.tm...
dchelimsky/rspec-tmbundle
1fd90eab6fc0d64cfbf001c3f665286ca3bc81e0
remove unused material
diff --git a/Support/lib/spec/mate.rb b/Support/lib/spec/mate.rb index 2386900..0d102fb 100644 --- a/Support/lib/spec/mate.rb +++ b/Support/lib/spec/mate.rb @@ -1,19 +1,18 @@ # This is based on Florian Weber's TDDMate require 'rubygems' rspec_rails_plugin = File.join(ENV['TM_PROJECT_DIRECTORY'],'vendor','plugins',...
dchelimsky/rspec-tmbundle
cadf500d9c41e7c7055a33783925ed94835f35d1
added haml support
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 16eb2f4..d1c1084 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,140 +1,142 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
1e6e5b39077b356a411de40d875ada40bf63eb5a
remove Story/Scenario snippets (which are now part of the Cucumber bundle)
diff --git a/Snippets/Scenario.tmSnippet b/Snippets/Scenario.tmSnippet deleted file mode 100644 index e5a79a1..0000000 --- a/Snippets/Scenario.tmSnippet +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1....
dchelimsky/rspec-tmbundle
65e46277ea52f5be3c3ba54d6a093814960902c5
remove Given/When/Then snippets (which are in Cucumber now)
diff --git a/Snippets/Given step matcher.tmSnippet b/Snippets/Given step matcher.tmSnippet deleted file mode 100644 index 4335134..0000000 --- a/Snippets/Given step matcher.tmSnippet +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www...
dchelimsky/rspec-tmbundle
a1864ed4feabb972eaacaa9ff09cf320a65bd647
Support for "it 'should'"-style pending tasks
diff --git a/Preferences/Symbol List: Pending.tmPreferences b/Preferences/Symbol List: Pending.tmPreferences new file mode 100644 index 0000000..900495a --- /dev/null +++ b/Preferences/Symbol List: Pending.tmPreferences @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLI...
dchelimsky/rspec-tmbundle
b89c020328988fd0fea26cc93ea4cbcaca774a12
add 'it should' snippet for when you want to start with 'should'
diff --git a/Snippets/It.tmSnippet b/Snippets/It.tmSnippet index e4f3652..ef5dfc3 100644 --- a/Snippets/It.tmSnippet +++ b/Snippets/It.tmSnippet @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist versi...
dchelimsky/rspec-tmbundle
adc94af1f4923b1c1daf23e7e8307f4d57c83fe8
Remove "should" from "it" snippet - lots of folks write good sentences without it and there is no need to force it.
diff --git a/Snippets/It.tmSnippet b/Snippets/It.tmSnippet index e3de605..e4f3652 100644 --- a/Snippets/It.tmSnippet +++ b/Snippets/It.tmSnippet @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!D...
dchelimsky/rspec-tmbundle
77c188102eaf621004ae98d362d4999063c58346
remove example from describe/context snippets
diff --git a/Snippets/Describe.tmSnippet b/Snippets/Describe.tmSnippet index 1521c37..48fc359 100644 --- a/Snippets/Describe.tmSnippet +++ b/Snippets/Describe.tmSnippet @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/Pro...
dchelimsky/rspec-tmbundle
a1785d8e30754b038d56d9910150c70e8a7901e0
make 'spec' the default Rake task
diff --git a/Support/Rakefile b/Support/Rakefile index d6fbd77..ec8798a 100644 --- a/Support/Rakefile +++ b/Support/Rakefile @@ -1,10 +1,12 @@ $:.unshift(File.dirname(__FILE__) + '/../../example_rails_app/vendor/plugins/rspec/lib') require 'rubygems' require 'spec/rake/spectask' +task :default => :spec + desc "Ru...
dchelimsky/rspec-tmbundle
a4f13a341d17a9d7e9929c4b56b9d345752f3cad
Updating switch_command to recognize Rails .rjs and .js.rjs files [#596 state:resolved]
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 0cadd75..16eb2f4 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,138 +1,140 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
44c9d4a4c884aaa7ca6082ad3022de1b6e53d11d
better README and add License
diff --git a/License.txt b/License.txt new file mode 100644 index 0000000..b51c560 --- /dev/null +++ b/License.txt @@ -0,0 +1,22 @@ +(The MIT License) + +Copyright (c) 2005-2008 Florian Weber (for TDDMate) and The RSpec Development Team + +Permission is hereby granted, free of charge, to any person obtaining +a copy of...
dchelimsky/rspec-tmbundle
15d2804966839773c4b7eba35fe73b587a329c45
properly highlite the word 'context'
diff --git a/Syntaxes/RSpec.tmLanguage b/Syntaxes/RSpec.tmLanguage index afbd4c5..f4efd5f 100644 --- a/Syntaxes/RSpec.tmLanguage +++ b/Syntaxes/RSpec.tmLanguage @@ -1,142 +1,142 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.d...
dchelimsky/rspec-tmbundle
f05e1720293cd7330a4bf8a88b8845c16cc3b7f1
very minor refactoring
diff --git a/Support/spec/spec/mate/switch_command_spec.rb b/Support/spec/spec/mate/switch_command_spec.rb index 01e3769..bfb755a 100644 --- a/Support/spec/spec/mate/switch_command_spec.rb +++ b/Support/spec/spec/mate/switch_command_spec.rb @@ -1,180 +1,179 @@ require File.dirname(__FILE__) + '/../../../lib/spec/mate/...
dchelimsky/rspec-tmbundle
4f7383f9950e4ea03e0e6af50c3cd585f049a04a
remove duplicate example
diff --git a/Support/spec/spec/mate/switch_command_spec.rb b/Support/spec/spec/mate/switch_command_spec.rb index 07ae14f..01e3769 100644 --- a/Support/spec/spec/mate/switch_command_spec.rb +++ b/Support/spec/spec/mate/switch_command_spec.rb @@ -1,185 +1,180 @@ require File.dirname(__FILE__) + '/../../../lib/spec/mate/...
dchelimsky/rspec-tmbundle
cc265b50d7365137c584aff7a06514157393fa4b
refactor switch command and its code examples
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 96126a2..0cadd75 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,139 +1,138 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
087b48a4a73bab46ffd3a35bd0dce1bfca7dfa42
Make 'Alternate File' Merb-aware [#582 state:resolved]
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 13ba5be..96126a2 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,131 +1,139 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
b0af1ce01062b36f0092247e3af0584175bcc170
Adding #!/usr/bin/env sh causes TextMate not to set the RUBYLIB variable, which was causing the builder gem issue with rails to surface.
diff --git a/Commands/Alternate File.tmCommand b/Commands/Alternate File.tmCommand index 0ebcd33..284cba0 100644 --- a/Commands/Alternate File.tmCommand +++ b/Commands/Alternate File.tmCommand @@ -1,29 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.a...
dchelimsky/rspec-tmbundle
44bdbf059325e6d3918afdaeca21ddcb9f4a3516
it do ... do it? ... how about 'specify do'
diff --git a/Support/spec/spec/mate/switch_command_spec.rb b/Support/spec/spec/mate/switch_command_spec.rb index 975b678..72019d3 100644 --- a/Support/spec/spec/mate/switch_command_spec.rb +++ b/Support/spec/spec/mate/switch_command_spec.rb @@ -1,213 +1,213 @@ require File.dirname(__FILE__) + '/../../../lib/spec/mate/...
dchelimsky/rspec-tmbundle
1ce532421530c79e92adbda27936b8da0b13bbbf
Fixed switching between application helper and application helper spec. Fixed switching between job applications controller and job applications controller spec
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 22868f0..13ba5be 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,133 +1,131 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
d951e57e9bbf052600a769cb4c0f88c411e8c942
add generic wrapper around ruby commands to allow specification of which ruby to use via the TM_RUBY variable
diff --git a/Commands/Alternate File.tmCommand b/Commands/Alternate File.tmCommand index 66b9e0c..0ebcd33 100644 --- a/Commands/Alternate File.tmCommand +++ b/Commands/Alternate File.tmCommand @@ -1,25 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "htt...
dchelimsky/rspec-tmbundle
74a0b8a6922621259e8eff6c7ecf537b10dce5db
Include the "Update RSec bundle" uuid in info.plist
diff --git a/info.plist b/info.plist index f8e34a4..db3db14 100644 --- a/info.plist +++ b/info.plist @@ -1,289 +1,290 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>deleted</key> <...
dchelimsky/rspec-tmbundle
cb6f80ee486fcac3642ac11bf6c148e8188adfe1
The snippet "describe (Controller)" now uses File.expand_path to require spec_helper
diff --git a/Snippets/controller_context.tmSnippet b/Snippets/controller_context.tmSnippet index ccfd712..a0da404 100644 --- a/Snippets/controller_context.tmSnippet +++ b/Snippets/controller_context.tmSnippet @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST...
dchelimsky/rspec-tmbundle
8b3bc99c3211b3b319ea5e58faa67013481a197c
Patch from Ryan Carmelo Briones to map alternate file for application.rb to application_controller_spec.rb. [#396 state:resolved]
diff --git a/Support/lib/spec/mate/switch_command.rb b/Support/lib/spec/mate/switch_command.rb index 9f709bb..22868f0 100644 --- a/Support/lib/spec/mate/switch_command.rb +++ b/Support/lib/spec/mate/switch_command.rb @@ -1,129 +1,133 @@ module Spec module Mate # This is based on Ruy Asan's initial code: #...
dchelimsky/rspec-tmbundle
8f272f25dba38766663753cc419a1187879fc6fb
conform to recent changes in rspec core
diff --git a/Support/Rakefile b/Support/Rakefile index 8fbb28d..d6fbd77 100644 --- a/Support/Rakefile +++ b/Support/Rakefile @@ -1,10 +1,10 @@ -$:.unshift(File.dirname(__FILE__) + '/../../rspec/lib') +$:.unshift(File.dirname(__FILE__) + '/../../example_rails_app/vendor/plugins/rspec/lib') require 'rubygems' require '...
dchelimsky/rspec-tmbundle
0755193efe57641b13767473f456ec1f145b92f0
ignore emacs files
diff --git a/.gitignore b/.gitignore index ee5a8a1..3b440e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ tmtags Support/coverage .DS_Store +.emacs-project +*~
dchelimsky/rspec-tmbundle
75bb140fadf22e077b802ae7db69f0f2427c65b2
Move relative location of rspec (core) directory.
diff --git a/Support/spec/spec_helper.rb b/Support/spec/spec_helper.rb index e7702c4..c4c2694 100644 --- a/Support/spec/spec_helper.rb +++ b/Support/spec/spec_helper.rb @@ -1,15 +1,15 @@ dir = File.dirname(__FILE__) $LOAD_PATH.unshift "#{dir}/../../../rspec/lib" require 'spec' require 'stringio' module Spec::Ex...
dchelimsky/rspec-tmbundle
332251974e9218527f8ec5eec4b0ae68a1ad3590
Added snippets for Given, When, & Then step matchers.
diff --git a/Snippets/Given step matcher.tmSnippet b/Snippets/Given step matcher.tmSnippet new file mode 100644 index 0000000..4335134 --- /dev/null +++ b/Snippets/Given step matcher.tmSnippet @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.app...
dchelimsky/rspec-tmbundle
614f647cf59c71de554d7b15c8443977e27deec6
Added mock_model snippet with 'mm' tab trigger.
diff --git a/Snippets/mock_model.tmSnippet b/Snippets/mock_model.tmSnippet new file mode 100644 index 0000000..01990ce --- /dev/null +++ b/Snippets/mock_model.tmSnippet @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-...
dchelimsky/rspec-tmbundle
d0b4d3c9778ad4e2b4f5c5d81bcb52748dd5f99c
Added "Update RSpec Bundle" command
diff --git a/Commands/Update RSpec Bundle.tmCommand b/Commands/Update RSpec Bundle.tmCommand new file mode 100644 index 0000000..a387bc2 --- /dev/null +++ b/Commands/Update RSpec Bundle.tmCommand @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www....
dchelimsky/rspec-tmbundle
4571eb02c9420737c3adf6bb25a7af8b968ba129
resolve .gitignore
diff --git a/.gitignore b/.gitignore index 5b55acb..ee5a8a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,3 @@ -*.svn -rspec/pkg -*/tmtags -example_rails_app/vendor/rails/* -log -RSpec.tmbundle/Support/coverage -doc/output -rspec/story_server/prototype/rspec_stories.html -example_rails_app/config/database.yml -e...
dchelimsky/rspec-tmbundle
cd2176712f8575d1e69f29a9a315f707074f7cd5
Better messages for mocks receiving correct message with wrong args when using :null_object => true. Further fixes http://rspec.lighthouseapp.com/projects/5645/tickets/352.
diff --git a/rspec/lib/spec/mocks/proxy.rb b/rspec/lib/spec/mocks/proxy.rb index 58266ed..710593c 100644 --- a/rspec/lib/spec/mocks/proxy.rb +++ b/rspec/lib/spec/mocks/proxy.rb @@ -1,175 +1,170 @@ module Spec module Mocks class Proxy DEFAULT_OPTIONS = { :null_object => false, } ...
dchelimsky/rspec-tmbundle
e81efef7089d5f1d65c49cc80395e394703e2e75
Better failure messages for a message expectation after a method stub. Fixes http://rspec.lighthouseapp.com/projects/5645/tickets/352.
diff --git a/rspec/lib/spec/mocks/message_expectation.rb b/rspec/lib/spec/mocks/message_expectation.rb index d7ab63c..0b10290 100644 --- a/rspec/lib/spec/mocks/message_expectation.rb +++ b/rspec/lib/spec/mocks/message_expectation.rb @@ -1,279 +1,291 @@ module Spec module Mocks class BaseExpectation at...