tonic 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tonic (0.0.1)
+    tonic (0.0.2)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -1,35 +1,33 @@
-# Tonic gem — add some tonus for your development :)
+# Tonic gem — add some tonus for development your gh-pages :)
 
 ### This is beta now
 
 ### Build Status ![http://travis-ci.org/gazay/gon](https://secure.travis-ci.org/gazay/tonic.png)
 
-If you want to create your simple static application,
-and want to use for that sass-compass/haml/coffee/something
-THIS GEM FOR YOU
+This gem supports [middleman](https://github.com/middleman/middleman)
+and will support in near future [jekyll](https://github.com/mojombo/jekyll) for generate template of your site.
 
 If you want to easily create custom gh-pages for your application,
 and again - want to use for that the same technologies
+
 THIS GEM TOTALY FOR YOU
 
+If you want to create your simple static application,
+and want to use for that sass-compass/haml/coffee/something
+
+THIS GEM FOR YOU
+
 ## Why?
 
 Because make html as html is too mainstream. Now you should know all
 benefits of using haml, coffee and sass. And of course other template engines for
 other or the same purposes. You should know and I think you love it.
 
-And what will you do if you need to create simple, one-page application?
-With static html, with not too big js and styles?
-Maybe I don't know something, but you sigh maybe about your
-lovely haml/sass/coffee and go to do all this stuff like in nineteens.
-
-Because for one single page you will not to run compass, compile each coffeescript and haml file.
-You just sit and write pure html/css/js.
-
-So I thought about it a little and made this gem.
+There a lot of cool static site generators, from jekyll to this one :)
+But no one give to you so simple ui (maybe middleman, but tonic knows how to do gh-pages branch right;)
 
-Ar first it was gem just for create gh-pages branch with some content (because I'm too lazy sometimes).
-But then I decided to do more - and now it will do all stuff for you. You just need write some nice code :)
+You can choose with what template you want to develop your site:
+tonic, middleman or jekyll (jekyll support not yet ready)
 
 
 ## How?
@@ -39,15 +37,48 @@ This gem have two functions inside:
   1. tonic-template
   2. tonic for gh-pages
 
-Tonic-template more important here, because it is that thing for easy developing!
+Tonic-template it is that thing for easy developing.
 Tonic-template uses for it's work several gems, like template engines, rake and sprockets.
 Sprockets make this template look like rails assets folder.
 
 You don't need every time run some command in terminal or push somewhere.
 You need just write `rake watch`
 
-Tonic for gh-pages is simplier, because it uses only ruby-lang libraries like open3 and pathname,
-and it's general purpose - is create new branch `gh-pages`, copy there tonic-template and run bundler.
+Tonic for gh-pages is simplier, because it uses only ruby-lang libraries like open3 and pathname and dependent on jekyll and middleman,
+and it's general purpose - is create new branch `gh-pages`, init there choosen template and run bundler if it's needed.
+
+### Using tonic for gh-pages
+
+You should be in your repo, for which you want to create gh-pages.
+You shouldn't have in this repo this branch already.
+So you just run:
+
+```bash
+$ gem install tonic
+$ tonic [middleman|jekyll]
+```
+
+It will ask you - do you really want blahblahblah. You say `y` and there is it!
+Will be created branch gh-pages, then tonic checkout you there and remove from there all (not dot-) files.
+Then it will copy choosen template to this branch and run bundle install if it's needed.
+
+And you can work with this template.
+
+When you want to push your gh-pages branch to github, just write:
+
+```bash
+$ tonic push
+```
+
+Or oldschool:
+
+```bash
+$ git push -f origin gh-pages
+```
+
+Example you can see on [gh-pages for tonic](http://gazay.github.com/tonic)
+
+And what inside template in [gh-pages branch](https://github.com/gazay/tonic/tree/gh-pages)
 
 ### Using tonic-template
 
@@ -74,37 +105,26 @@ Then you can do two things:
   bundle exec rake watch
   ```
 
-Later I will add comands with tonic, but now I tired :)
-And I want to add comands to open needed files from terminal.
-
-### Using tonic for gh-pages
-
-You should be in your repo, for which you want to create gh-pages.
-You shouldn't have in this repo this branch already.
-So you just run:
-
-```bash
-$ gem install tonic
-$ tonic
-```
-
-It will ask you - do you really want blahblahblah. You say `y` and there is it!
-Will be created branch gh-pages, then you checkout there and remove from there all files.
-Then tonic will copy tonic-template to this branch and run bundle install.
-
-Then you just work with this template like with ordinary tonic-template.
-
 ## What?
 
-In template used next gems for make it work:
+In tonic used next gems for make it work:
 
 [rake](https://github.com/jimweirich/rake)
+
 [bundler](https://github.com/carlhuda/bundler)
+
 [uglifier](https://github.com/lautis/uglifier)
+
 [sprockets](https://github.com/sstephenson/sprockets)
+
 [haml](https://github.com/nex3/haml)
+
 [compass](https://github.com/chriseppstein/compass)
 
+[middleman](https://github.com/middleman/middleman)
+
+[jekyll](https://github.com/mojombo/jekyll)
+
 Lot of code for rakefile of template and for octocat in test page
 I get from one-page project of my friend @ai [easings.net](https://github.com/ai/easings.net)
 

data/lib/tonic.rb

@@ -13,12 +13,12 @@ module Tonic
     private
 
     def deal_with_args(args)
-      if args.empty?
-        Tonic::GhPages.activate
+      if want_to_push?(args)
+        Tonic::GhPages.push_pages
+      elsif want_gh_pages?
+        Tonic::GhPages.activate(args[0])
       elsif want_to_create?(args)
         Tonic::Template.create args[1]
-      elsif want_to_push?(args)
-        Tonic::GhPages.push_pages
       else
         raise ArgumentError.new 'Strange argument you sent to tonic'
       end
@@ -32,5 +32,9 @@ module Tonic
       args[0] == 'push'
     end
 
+    def wand_gh_pages?
+      args.empty? or %w(middleman jekyll).include?(args[0])
+    end
+
   end
 end

data/lib/tonic/gh_pages.rb

@@ -2,8 +2,8 @@ module Tonic
   module GhPages
     class << self
 
-      def activate
-        gh_pages
+      def activate(template = nil)
+        gh_pages(template)
       end
 
       def push_pages
@@ -21,7 +21,9 @@ module Tonic
         branches.lines.any? { |it| it =~ /\* gh-pages/ }
       end
 
-      def gh_pages
+      def gh_pages(template = nil)
+        are_you_in_repo?
+
         if branch_exists?
           abort 'You shall no pass. First you should delete gh-pages branch'
         end
@@ -31,11 +33,30 @@ module Tonic
           check_status
           create_branch
           remove_all_files
-          Template.create
+          create template
           commit_changes
         end
       end
 
+      def create(template = nil)
+        case template
+        when 'middleman'
+          sh 'middleman init ./'
+        when 'jekyll'
+          puts 'I will add integration with Jekyll later, now I will install tonic-template'
+          Template.create
+        else
+          Template.create
+        end
+      end
+
+      def are_you_in_repo?
+        check = sh('git status').to_s
+        if check =~ /Not a git repository/
+          abort "You are not in git repo. If you want to create tonic-template write `tonic new my_app`"
+        end
+      end
+
       def branch_exists?
         branches = sh('git branch')
         branches.lines.any? { |it| it =~ /gh-pages/ }

data/lib/tonic/version.rb

@@ -1,5 +1,5 @@
 module Tonic
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 end

data/spec/tonic/tonic_spec.rb

@@ -0,0 +1,19 @@
+require 'tonic'
+
+describe Tonic do
+  context 'Tonic will' do
+
+    before :all do
+      system 'cd spec/dummy_git_repo'
+    end
+
+    it "" do
+      Tonic.activate([]).should =~ /not in root of your repo/
+    end
+
+    after :all do
+      system 'cd ...'
+    end
+
+  end
+end

data/template/assets/sass/application.css.sass

@@ -58,6 +58,7 @@ a
     line-height: 1.1
     code
       font-size: 10px
+      font-family: "PT Mono", monospace
   .source-crop
     position: absolute
     width: 120px

data/template/assets/templates/index.html.haml

@@ -4,7 +4,7 @@
 %h1
   %a( href='https://github.com/gazay/tonic' ) This is tonic gem gh-page
 
-%h2 Which was made with tonic-template: sass(with compass)/haml/coffee.
+%h2 Which was made with tonic-template: sass/compass/haml/coffee.
 
 .tonic-logo
 

data/tonic.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ['gazay']
   s.email       = ['alex.gaziev@gmail.com']
   s.homepage    = "https://github.com/gazay/tonic"
-  s.summary     = %q{Create github pages easy with Sass, Haml/Slim, Coffee.}
+  s.summary     = %q{Create one-page apps easy with Sass, Haml/Compass, Coffee.}
   s.description = %q{You don't need to write your github pages in html and css anymore - now it's simple to use your favorite technologies with tonic!}
 
   s.rubyforge_project = "tonic"
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib", "bin"]
 
+  s.add_dependency "middleman"
+  s.add_dependency "jekyll"
+
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tonic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,9 +11,31 @@ bindir: bin
 cert_chain: []
 date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: middleman
+  requirement: &70281059243480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70281059243480
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: &70281059241580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70281059241580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70292517141580 !ruby/object:Gem::Requirement
+  requirement: &70281059239400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292517141580
+  version_requirements: *70281059239400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70292517140780 !ruby/object:Gem::Requirement
+  requirement: &70281059238320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292517140780
+  version_requirements: *70281059238320
 description: You don't need to write your github pages in html and css anymore - now
   it's simple to use your favorite technologies with tonic!
 email:
@@ -69,7 +91,6 @@ files:
 - template/assets/sass/_base.sass
 - template/assets/sass/application.css.sass
 - template/assets/templates/index.html.haml
-- template/assets/templates/index.html.slim
 - template/assets/templates/layout/layout.html.haml
 - tonic.gemspec
 homepage: https://github.com/gazay/tonic
@@ -96,7 +117,7 @@ rubyforge_project: tonic
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Create github pages easy with Sass, Haml/Slim, Coffee.
+summary: Create one-page apps easy with Sass, Haml/Compass, Coffee.
 test_files:
 - spec/tonic/fail_spec.rb
 - spec/tonic/tonic_spec.rb