Tagarchief: git

Node.js & GitHub & Streamie

Geplaatst op door
(For Mac OS X)
I ran into Streamie today. It’s supposed to be a highly hackable Twitter client that runs in your HTML5 enabled browser. This blogpost tries to describe the problems I ran into while trying to get it running on my own machine.
  1. If you’re new to GitHub, git and SSH (or didn’t install it yet on your machine), visit this help page.
  2. Install node.js (instructions)
  3. Install npm (node package manager) by typing this in your Terminal window: 
    $ curl http://npmjs.org/install.sh | sudo sh
  4. Fork streamie on GitHub and clone your fork: 
    $ git clone git@github.com:USERNAME/streamie.git
  5. Do this: 
    $ sudo sh deps
$ git branch gh-pages
$ git checkout gh-pages
$ git pull origin gh-pages
  6. At the time of this writing, you’ll then run into this error message: 
    * branch            gh-pages   -> FETCH_HEAD
Auto-merging public/css/basic.less
CONFLICT (content): Merge conflict in public/css/basic.less
Auto-merging public/index.html
CONFLICT (content): Merge conflict in public/index.html
Auto-merging public/lib/stream/app.js
Auto-merging public/lib/stream/initplugins.js
Auto-merging public/lib/stream/status.js
Automatic merge failed; fix conflicts and then commit the result.
  7. I removed the <<< HEAD, ==== and >>> in public/css/basic.less and public/index.html
  8. Pushing these changes back and let’s hope this thing runs. 
    $ git add public/css/basic.less
$ git add public/index.html
$ git commit -m "Hopefully solved merging errors."
$ git push origin gh-pages
Counting objects: 31, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (10/10), done.
Writing objects: 100% (11/11), 1.46 KiB, done.
Total 11 (delta 9), reused 0 (delta 0)
To git@github.com:USERNAME/streamie.git
   90db378..c67cae8  gh-pages -> gh-pages
  9. Apparently a few brackets were missing in public/css/basic.less (in html.no-utf8). 
    $ git commit -a -m "Fixed a CSS bug (missing }'s) in public/css/basic.less"
$ git push origin gh-pages

Here’s a screenshot of my current branch:

My current branch of Streamie.

My current branch of Streamie.

Tomorrow I’ll try to add a basic tweet filter. The goal is to filter out tweets that contain a user-defined word (bye bye stupid games that use hashtags etc.)