If anyone feels like trying it out, please go ahead and report any
problems. I'd like to eventually switch the mainline to Rails 3.1, but
would like to iron out any problems before the switch and ideally get a
lot of eyes on it.
In particular, it doesn't look like things are going to work out of the
box on Heroku, so the README will need updating with working
instructions.
Malc
File to import not found or unreadable: icon/*.png.
Load path: Sass::Rails::Importer(/Users/tharrison/Sites/fulcrum/app/assets/stylesheets/icons.css.scss)
(in /Users/tharrison/Sites/fulcrum/app/assets/stylesheets/icons.css.scss)
Something stupid, no doubt. I have previously not been too worried about upgrading to 3.1, but it's
come on my radar of late as I'm planning to do a fair bit of
refactoring, including moving to JST templates. Having the asset
pipeline available would be a real bonus for this.
It's been quite a while since I tried, so hopefully some of the glitches
with Heroku can be worked through.
If you could make a pull request with any of your fixes based off of
Bradley's work that would be great, and we can get the ball rolling on
this again. I'm quite happy for the master branch to go to Rails 3.1 if
we can get it all working nicely.
Malc
On Thu, Mar 01, 2012 at 12:26:04PM -0800, Tom Harrison wrote:
> Quick followup: merge seemed mostly straightforward -- most changes are
> asset-related, and the rest seem straightforward.
>
> However, it looks like compass or sass are unhappy generating or
> referencing sprites. I did find one reference to an issue with Rails 3.1.0<https://github.com/compass/compass-rails>,
Look forward to welcoming your first contributions ;)
Malc
Brad -- thanks for the lead on icon != icons. Sounds like a likely scenario. I'll keep poking.
I just tried merging this against my master and there are a pretty huge
number of merge conflicts. This is basically due to the branch you are
working from (Bradley's 3.1 branch) being about 5 months behind
mainline.
I think we probably just need to start from scratch from my master as
merging this is going to be too difficult as it stands. I'd suggest the
following:
- Rebase or cherry pick Bradley's 3.1 branch against my master, and fix
up as necessary. I think cherry pick will probably be the best
strategy, as previously stated by Bradley.
- Apply your extra changes on top of this.
Anyone like to tackle this? If not I'll do so myself, hopefully over
the next few days.
Malc
> >> > read more �
> >
> >
> >> > read more �
> >
> >
Massive thanks to Bradley and Tom for pushing this along. I've pushed
this to master now, let's see if it sticks!
This will simplify the refactoring of the JS views, which is long
overdue, and make the step up to Rails 3.2 a lot easier.
Looks like Travis CI is throwing up a build error on Ruby 1.9.2, but
apart from that everything looks sweet from my end.
Thanks again guys,
Malc
> > read more �
BOOM!Massive thanks to Bradley and Tom for pushing this along. I've pushed
this to master now, let's see if it sticks!This will simplify the refactoring of the JS views, which is long
overdue, and make the step up to Rails 3.2 a lot easier.Looks like Travis CI is throwing up a build error on Ruby 1.9.2, but
apart from that everything looks sweet from my end.Thanks again guys,
Malc
On Sun, Mar 04, 2012 at 11:31:58AM -0800, Bradley Priest wrote:
> I'll have a look at rebasing it tonight.
>
> Cheers
>
> On Mar 4, 11:05�pm, Malcolm Locke <m...@wholemeal.co.nz> wrote:
> > Tom,
> >
> > I just tried merging this against my master and there are a pretty huge
> > number of merge conflicts. �This is basically due to the branch you are
> > working from (Bradley's 3.1 branch) being about 5 months behind
> > mainline.
> >
> > I think we probably just need to start from scratch from my master as
> > merging this is going to be too difficult as it stands. �I'd suggest the
> > following:
> >
> > - Rebase or cherry pick Bradley's 3.1 branch against my master, and fix
> > � up as necessary. �I think cherry pick will probably be the best
> > � strategy, as previously stated by Bradley.
> > - Apply your extra changes on top of this.
> >
> > Anyone like to tackle this? �If not I'll do so myself, hopefully over
> > the next few days.
> >
> > Malc
> >
> >
> >
> >
> >
> >
> >
> > On Sat, Mar 03, 2012 at 10:29:57AM -0800, Tom Harrison wrote:
> > > Another PR, merging rails31 onto master, which I think is the one you want.
> > > �Works for me on ruby 1.9.2-p290, tests pass (except suspected timezone
> > > issue in jasmine).
> >
> > > Tom
> >
> > > On Saturday, March 3, 2012 12:55:09 PM UTC-5, Tom Harrison wrote:
> >
> > > > OK, so there's a PR out there for you, but I think I went the "wrong
> > > > direction" (merge master into rails3.1, not rails3.1 into master). �I am
> > > > not yet a git ninja, to say the least.
> >
> > > > Perhaps that PR is worth something, but if not, let me know and I'll try
> > > > doing it properly.
> >
> > > > Tom
> >
> > > > On Friday, March 2, 2012 11:33:24 PM UTC-5, Bradley Priest wrote:
> >
> > > >> Sweet, did the icon/icons thing fix the compass problems?
> > > >> If you've got it all working no need for me to remerge, have you got
> > > >> your merged branch up somewhere where I can take a quick look, might
> > > >> as well create a PR on Github for it and get some opinions, it's been
> > > >> a while since I've looked at the 3.1 code to be honest.
> >
> > > >> It'll be good to get a functional, up-to-date 3.1 version up and
> > > >> running and then I'm sure people can start thinking about
> > > >> restructuring the codebase.
> >
> > > >> Brad
> >
> > > >> On Mar 3, 11:21 am, Tom Harrison <tom.harrison...@gmail.com> wrote:
> > > >> > Hi again gentlemen --
> >
> > > >> > Well.... I did get the app working by merging Bradley's rails3.1 branch
> > > >> > with his forked version of master. �It took about 10 minutes, and then
> > > >> > another hour to hunt down a few little things. �These simple changes
> > > >> other
> > > >> > than obvious merges got the app functional:
> >
> > > >> > � �- rename jquery.tagit to jquery_tagit and update
> > > >> application.css.scss
> > > >> > � �and screen.css.scss
> > > >> > � �- remove bootstrap-twipsy import from screen.css.scss (or perhaps
> > > >> add
> > > >> > � �the required file)
> >
> > > >> > So if this (trivial) effort is worth it, I am happy to push the changes
> > > >> to
> > > >> > a new branch on Bradley's fork ... but perhaps it's easier just to do
> > > >> the
> > > >> > merge I did. �It's really short and sweet.
> >
> > > >> > Let me know if you need more info.
> >
> > > >> > I do think catching up to where backbone and rails seem to be heading
> > > >> is a
> > > >> > worthy goal -- the rails-backbone gem is pretty nice and provides a
> > > >> > opinionated structure that works with asset pipeline, and EJS templates
> > > >> > (both very Rails-y concepts).
> >
> > > >> > Tom
> >
> > > >> > On Thursday, March 1, 2012 8:46:37 PM UTC-5, Tom Harrison wrote:
> >
> > > >> > > Brad -- thanks for the lead on icon != icons. �Sounds like a likely
> > > >> > > scenario. �I'll keep poking.
> > > >> > >> > > Cool! �I'll fumble around a little more to see if I can make my
> > > >> merged
> > > >> > >> > > branch work. �Might be worth just going to Rails 3.2 (although
> > > >> that
> > > >> > >> does
> > > >> > >> > > depend on ruby 1.9.3, which might be an issue with Heroku).
> >
> > > >> > >> > > Anyway, I'll do this the official way and maybe Brad might have
> > > >> some
> > > >> > >> ideas
> > > >> > >> > > for getting over my Compass/SASS hurdles.
> >
> > > >> > >> > > Nice to meet you!
> >
> > > >> > >> > > Tom
> >
> > > >> > >> > > On Thursday, March 1, 2012 4:11:52 PM UTC-5, malclocke wrote:
> >
> > > >> > >> > > > Hi Tom,
> >
> > > >> > >> > > > I have previously not been too worried about upgrading to 3.1,
> > > >> but
> > > >> > >> it's
> > > >> > >> > > > come on my radar of late as I'm planning to do a fair bit of
> > > >> > >> > > > refactoring, including moving to JST templates. �Having the
> > > >> asset
> > > >> > >> > > > pipeline available would be a real bonus for this.
> >
> > > >> > >> > > > It's been quite a while since I tried, so hopefully some of
> > > >> the
> > > >> > >> glitches
> > > >> > >> > > > with Heroku can be worked through.
> >
> > > >> > >> > > > If you could make a pull request with any of your fixes based
> > > >> off of
> > > >> > >> > > > Bradley's work that would be great, and we can get the ball
> > > >> rolling
> > > >> > >> on
> > > >> > >> > > > this again. �I'm quite happy for the master branch to go to
> > > >> Rails
> > > >> > >> 3.1 if
> > > >> > >> > > > we can get it all working nicely.
> >
> > > >> > >> > > > Malc
> >
> > > >> > >> > > > On Thu, Mar 01, 2012 at 12:26:04PM -0800, Tom Harrison wrote:
> > > >> > >> > > > > Quick followup: merge seemed mostly straightforward -- most
> > > >> > >> changes are
> > > >> > >> > > > > asset-related, and the rest seem straightforward.
> >
> > > >> > >> > > > > However, it looks like compass or sass are unhappy
> > > >> generating or
> > > >> > >> > > > > referencing sprites. �I did find one reference to an issue
> > > >> with
> > > >> > >> Rails
> > > >> > >> > > > 3.1.0<https://github.com/compass/compass-rails>,
> > > >> > >> > > > > so moved up to 3.1.3 ... no better. �I am not a Compass
> > > >> ninja yet.
> >
> > > >> > >> > > > > When loading the application layout (in other words, just as
> > > >> the
> > > >> > >> app is
> > > >> > >> > > > > loading), I am getting:
> >
> > > >> > >> > > > > File to import not found or unreadable: icon/*.png.
> > > >> > >> > > > > Load path:
> >
> > > >> Sass::Rails::Importer(/Users/tharrison/Sites/fulcrum/app/assets/stylesheets
> > > >> > >> /icons.css.scss)
> > > >> > >> > > > > � (in
> >
> > > >> /Users/tharrison/Sites/fulcrum/app/assets/stylesheets/icons.css.scss)
> >
> > > >> > >> > > > > Something stupid, no doubt.
> >
> > > >> > >> > > > > Tom
> >
> > > >> > >> > > > > On Thursday, March 1, 2012 11:42:26 AM UTC-5, Tom Harrison
> > > >> wrote:
> >
> > > >> > >> > > > > > Hi Brad and Malc --
> >
> > > >> > >> > > > > > I just pulled the Rails 3.1 branch and everything seems to
> > > >> be
> > > >> > >> working
> > > >> > >> > > > > > locally. �(Note for other readers -- if you tried the
> > > >> master
> > > >> > >> version
> > > >> > >> > > > first,
> > > >> > >> > > > > > you'll have to delete your session cookie before the 3.1
> > > >> > >> version will
> > > >> > >> > > > work).
> >
> > > >> > >> > > > > > I haven't tried pushing to Heroku yet, but I think I know
> > > >> how
> > > >> > >> to deal
> > > >> > >> > > > with
> > > >> > >> > > > > > the error you're seeing (The Heroku docs have some tips,
> > > >> and I
> > > >> > >> have
> > > >> > >> > > > done
> > > >> > >> > > > > > battle with Devise before :-).
> >
> > > >> > >> > > > > > I am wondering where this branch stands -- do you expect
> > > >> to
> > > >> > >> merge to
> > > >> > >> > > > > > master? �Have you tried? �Rails 3.2 is nice, too (and
> > read more �
Looks like that's not set on Heroku cedar or bamboo. That one must have
slipped past me without being verified, unless it used to be defined on
heroku but they have since removed it, which I doubt.
I think options like that need to be extracted out to a config file that
isn't in source control, I'll put it in the backlog.
Malc