tonic 0.0.4 → 0.0.6

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
+#  - jruby-18mode # JRuby in 1.8 mode
+#  - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
   - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:

data/Gemfile.lock

@@ -1,12 +1,102 @@
 PATH
   remote: .
   specs:
-    tonic (0.0.2)
+    tonic (0.0.4)
+      jekyll
+      middleman
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.7)
+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)
+    chunky_png (1.2.5)
+    classifier (1.3.3)
+      fast-stemmer (>= 1.0.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.2.0)
+    compass (0.12.1)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    daemons (1.1.8)
     diff-lcs (1.1.3)
+    directory_watcher (1.4.1)
+    em-websocket (0.3.6)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    eventmachine (0.12.10)
+    execjs (1.2.13)
+      multi_json (~> 1.0)
+    fast-stemmer (1.0.0)
+    fssm (0.2.8.1)
+    guard (0.6.3)
+      thor (~> 0.14.6)
+    guard-livereload (0.3.1)
+      em-websocket (>= 0.2.0)
+      guard (>= 0.4.0)
+      multi_json (~> 1.0.3)
+    haml (3.1.4)
+    hike (1.2.1)
+    http_router (0.10.2)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
+    i18n (0.6.0)
+    jekyll (0.11.2)
+      albino (~> 1.3)
+      classifier (~> 1.3)
+      directory_watcher (~> 1.1)
+      kramdown (~> 0.13)
+      liquid (~> 2.3)
+      maruku (~> 0.5)
+    kramdown (0.13.5)
+    liquid (2.3.0)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    middleman (2.0.15.1)
+      coffee-script (~> 2.2.0)
+      compass (~> 0.11)
+      execjs (~> 1.2.7)
+      guard (~> 0.6.2)
+      haml (~> 3.1.0)
+      maruku (~> 0.6.0)
+      middleman-livereload (~> 0.2.0)
+      padrino-core (~> 0.10.5)
+      padrino-helpers (~> 0.10.5)
+      rack (~> 1.3.5)
+      rack-test (~> 0.6.1)
+      sass (>= 3.1.7)
+      sinatra (~> 1.3.1)
+      slim (~> 1.0.2)
+      sprockets (~> 2.0.3)
+      thin (~> 1.2.11)
+      thor (~> 0.14.0)
+      tilt (~> 1.3.1)
+      uglifier (~> 1.0.0)
+    middleman-livereload (0.2.1)
+      guard-livereload (~> 0.3.1)
+    multi_json (1.0.4)
+    padrino-core (0.10.6)
+      activesupport (~> 3.2.0)
+      http_router (~> 0.10.2)
+      sinatra (~> 1.3.1)
+      thor (~> 0.14.3)
+      tilt (~> 1.3.0)
+    padrino-helpers (0.10.6)
+      i18n (~> 0.6)
+      padrino-core (= 0.10.6)
+    posix-spawn (0.3.6)
+    rack (1.3.6)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -16,6 +106,31 @@ GEM
     rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    sass (3.1.15)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slim (1.0.4)
+      temple (~> 0.3.4)
+      tilt (~> 1.3.2)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    syntax (1.0.0)
+    temple (0.3.5)
+    thin (1.2.11)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    uglifier (1.0.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    url_mount (0.2.1)
+      rack
 
 PLATFORMS
   ruby

data/README.md

@@ -58,7 +58,6 @@ $ 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.
 

data/lib/tonic/gh_pages.rb

@@ -28,14 +28,11 @@ module Tonic
           abort 'You shall no pass. First you should delete gh-pages branch'
         end
 
-        puts 'Do you really want to create gh-pages branch with tonic? [y/n]'
-        if gets.chomp =~ /y/i
-          check_status
-          create_branch
-          remove_all_files
-          create template
-          commit_changes
-        end
+        check_status
+        create_branch
+        remove_all_files
+        create template
+        commit_changes
       end
 
       def create(template = nil)

data/lib/tonic/version.rb

@@ -1,5 +1,5 @@
 module Tonic
 
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 
 end

data/spec/tonic/tonic_spec.rb

@@ -1,51 +1,56 @@
 require 'tonic'
 
-module Tonic
-  module GhPages
-    class << self
+describe Tonic do
+  context 'Tonic will' do
+
+    context "create gh-pages and" do
+
+      before :all do
+        unless Dir.pwd =~ /spec\/dummy_git_repo/
+          command = <<EOF
+            cd spec/dummy_git_repo;\
+            git init;\
+            git add .;\
+            git commit -am 'init commit';\
+            rspec ../../
+EOF
+          exec command
+        end
+      end
 
-      private
+      it "copy there tonic-template" do
+        Tonic.activate []
 
-      def gh_pages(template = nil)
-        are_you_in_repo?
+        Tonic::Shell.new('git branch').run.to_s.should =~ /\* gh-pages/
 
-        if branch_exists?
-          abort 'You shall no pass. First you should delete gh-pages branch'
-        end
+        Dir.glob('*').should == %w(assets Gemfile Gemfile.lock Rakefile)
 
-        # This for run shell commands from needed directory
-        # puts 'Do you really want to create gh-pages branch with tonic? [y/n]'
-        # if gets.chomp =~ /y/i
-          check_status
-          create_branch
-          remove_all_files
-          create template
-          commit_changes
-        # end
+        Tonic::Shell.new('git status -s').run.to_s.should == ""
       end
 
-    end
-  end
-end
+      it "copy there middleman template" do
+        Tonic.activate ['middleman']
 
-describe Tonic do
-  context 'Tonic will' do
+        Tonic::Shell.new('git branch').run.to_s.should =~ /\* gh-pages/
 
-    it "do the right stuff with repo" do
-      unless Dir.pwd =~ /spec\/dummy_git_repo/
-        exec 'cd spec/dummy_git_repo; rspec ../../'
-      else
-        Tonic.activate []
-        Dir.glob('*').size.should == 4
-        c = Tonic::Shell.new('git status -s').run.to_s.should == ""
+        Dir.glob('*').should == %w(config.rb source)
+
+        Tonic::Shell.new('git status -s').run.to_s.should == ""
+      end
+
+      after :each do
+        if Dir.pwd =~ /spec\/dummy_git_repo/
+          `git checkout master; git branch -D gh-pages`
+        end
       end
-    end
 
-    if Dir.pwd =~ /spec\/dummy_git_repo/
       after :all do
-        `git checkout master; git branch -D gh-pages`
-        exec 'cd ../..'
+        if Dir.pwd =~ /spec\/dummy_git_repo/
+          `rm -rf .git`
+          exec 'cd ../..'
+        end
       end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tonic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
-  requirement: &70363183195400 !ruby/object:Gem::Requirement
+  requirement: &70181926348940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363183195400
+  version_requirements: *70181926348940
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70363183194560 !ruby/object:Gem::Requirement
+  requirement: &70181926347700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363183194560
+  version_requirements: *70181926347700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70363183192680 !ruby/object:Gem::Requirement
+  requirement: &70181926346820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363183192680
+  version_requirements: *70181926346820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70363183190800 !ruby/object:Gem::Requirement
+  requirement: &70181926344780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363183190800
+  version_requirements: *70181926344780
 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: