carb 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+### 0.0.4 / 2012-10-04 ###
+
+* Early release with create task, built upon `clamp`

data/bin/carb

@@ -4,7 +4,9 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
-require 'trollop'
-require 'carb'
+require 'fileutils'
+require "clamp"
 
-Carb::CLI.start
+require 'carb/cli'
+
+Carb::CLI.run

data/carb.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Carb::VERSION
   
-  gem.add_dependency "trollop"
-  gem.add_dependency "colored"
+  gem.add_dependency "clamp"
   gem.add_dependency "fileutils"
 end

data/lib/carb.rb

@@ -1,11 +1,2 @@
-require 'rubygems'
-require 'colored'
-require 'fileutils'
-
-require 'carb/version'
-require 'carb/config'
-require 'carb/cli'
-require 'carb/controller'
-
 module Carb
 end

data/lib/carb/cli.rb

@@ -1,57 +1,36 @@
 require 'carb'
 
+require 'carb/config'
+require 'carb/logger'
+require 'carb/controller'
+
 module Carb
-  class CLI
-    class << self
-      SUB_COMMANDS = %w(create)
-
-      def start
-        puts 'TODO: implement the target param'.black.reversed
-        puts 'TODO: alter the default view, merge with index.html'.black.reversed
-        puts 'TODO: add check if target exists'.black.reversed
-        puts 'TODO: use FileUtils as much as possible'.black.reversed
-        puts 'TODO: check if repos are there'.black.reversed
-        global_opts = Trollop::options do
-          version = "Carb v#{Carb::VERSION}"
-          banner <<-EOS
-#{version}
-
-Carb gets your fuel flowing. Use it to setup your web dev env.
-
-Usage:
-        carb create <type> <folder>
-
-Where <type> is one of:
-        octaplus      our fuelphp framework, this is as bare as it gets 
-        bearded-octo  our frontend framework together with moreoreless for less/css
-        on-fire       octaplus + bearded-octo = dev on fire!
-
-EOS
-
-          # raise Trollop::HelpNeeded if ARGV.empty? # show help screen
-          stop_on SUB_COMMANDS
-        end
-
-        cmd = ARGV.shift # get the subcommand
-        cmd_opts = case cmd
-           when "create" # parse create options
-             Trollop::options do
-               type = ARGV.shift
-               target = ARGV.shift || "."
-
-               if Carb::PROJECT_TYPES.include?(type)
-                 Carb::Controller.assemble(type, target)
-               else
-                 Trollop::die "wrong type passed. Use one these options: [#{Carb::PROJECT_TYPES.join(' | ')}]."
-               end
-             end
-            when nil
-              Trollop::die "No command specified! Please specify an applicable command"
-           else
-             Trollop::die "Unknown command #{cmd.inspect}"
-           end
+  module CLI
 
+    class InstallCommand < Clamp::Command
+      parameter "TYPE", "The type of project, being one of: octaplus, bearded-octo, on-fire" do |s|
+        raise ArgumentError.new('Not a correct project type.') unless Carb::Config::PROJECT_TYPES.include?(s)
+        s # return the actual value
       end
+
+      parameter "[TARGET]", "The target folder", :default => "."
+
+      def execute
+        Carb::Controller.assemble(type, target)
+      end
+    end
+
+    class MainCommand < Clamp::Command
+      Logger::log('TODO: alter the default view, merge with index.html', Logger::WARNING)
+      Logger::log('TODO: add check if target exists', Logger::WARNING)
+      Logger::log('TODO: use FileUtils as much as possible', Logger::WARNING)
+      Logger::log('TODO: check if repos are there', Logger::WARNING)
+
+      subcommand "install", "Install a new project", InstallCommand
+    end
+
+    def self.run(*a)
+      MainCommand.run(*a)
     end
   end
 end

data/lib/carb/config.rb

@@ -1,9 +1,16 @@
 module Carb
-  TYPE_OCTAPLUS = 'octaplus'
-  TYPE_BEARDED_OCTO = 'bearded-octo'
-  TYPE_ON_FIRE = 'on-fire'
+  module Config
+    TYPE_OCTAPLUS = 'octaplus'
+    TYPE_BEARDED_OCTO = 'bearded-octo'
+    TYPE_ON_FIRE = 'on-fire'
 
-  PROJECT_TYPES = [TYPE_OCTAPLUS, TYPE_BEARDED_OCTO, TYPE_ON_FIRE]
+    DIR_OCTAPLUS = 'octaplus'
+    DIR_BEARDED = 'bearded'
+    DIR_MOREORLESS = 'moreorless'
+    DIR_COOKPOT = 'cookpot'
 
-  TMP_FOLDER = "/tmp/proxdev"
+    PROJECT_TYPES = [TYPE_OCTAPLUS, TYPE_BEARDED_OCTO, TYPE_ON_FIRE]
+
+    TMP_FOLDER = "/tmp/proxdev"
+  end
 end

data/lib/carb/controller.rb

@@ -12,17 +12,18 @@ module Carb
       ##################################
       
       def assemble(type, target)
+
         @type = type
         @target = target || "."
 
         set_up()
 
         case @type
-        when Carb::TYPE_OCTAPLUS
+        when Config::TYPE_OCTAPLUS
           cook_octaplus()
-        when Carb::TYPE_BEARDED_OCTO
+        when Config::TYPE_BEARDED_OCTO
           cook_bearded_octo()
-        when Carb::TYPE_ON_FIRE
+        when Config::TYPE_ON_FIRE
           cook_on_fire()
         end
 
@@ -30,40 +31,28 @@ module Carb
       end
 
       def set_up
-        puts "⚡ Preparing your package, hold on ⚡".blue
+        Logger::log("⚡ Preparing your package, hold on ⚡", Logger::INFO)
 
         # save pwd
         @pwd = Dir.pwd
 
-        # remove previous
-        %x[rm -rf #{Carb::TMP_FOLDER}]
-
-        # FileUtils.rm_rf = "#{TMP_FOLDER}"
-        
         # create tmp folder
-        %x[mkdir -p #{Carb::TMP_FOLDER}]
-
-        # create some collecting folders
-        #
-        # TODO these subfolder names should be the same as the PROJECT_TYPES
-        # used by the CLI app. Maybe create a Config class with static members ?
-        # Or how can you handle config files in ruby?
-        #
-        # %x[mkdir -p #{TMP_FOLDER}/octaplus #{TMP_FOLDER}/bearded #{TMP_FOLDER}/boilerplate]
+        FileUtils.mkdir_p "#{Config::TMP_FOLDER}"
 
         # and move to the root of them
-        Dir.chdir "#{Carb::TMP_FOLDER}"
+        Dir.chdir "#{Config::TMP_FOLDER}"
       end
 
       def tear_down
         # copy the bundle to the current working directory
-        puts "", "⚡⚡⚡ Et voila! All set in the ./#{@target} folder ⚡⚡⚡ ".green.reversed
+        FileUtils.mkdir_p "#{@pwd}/#{@target}"
+        FileUtils.cp_r "#{Config::DIR_COOKPOT}/.", "#{@pwd}/#{@target}" 
+        
         puts ""
+        Logger::log("⚡⚡⚡ Et voila! All set in the ./#{@target} folder ⚡⚡⚡ ", Logger::SUCCESS)
 
-        %x[mkdir -p #{@pwd}/#{@target} | cp -R boilerplate/ #{@pwd}/#{@target}]
-        
         # clean up
-        # %x[rm -rf #{TMP_FOLDER}]
+        # FileUtils.remove_dir "#{Config::TMP_FOLDER}", :force => true
       end
 
       ##################################
@@ -71,20 +60,23 @@ module Carb
       ##################################
 
       def get_octaplus
-        puts '   ⚡ A bit of Octaplus goodness'
-        %x[mkdir -p octaplus]
+        Logger::log("   ⚡ A bit of Octaplus goodness", Logger::INFO)
+
+        FileUtils.mkdir_p "#{Config::DIR_OCTAPLUS}"
         %x[curl -L -s https://github.com/proximitybbdo/octaplus/tarball/master | tar xz --strip 1 -C octaplus]
       end
 
       def get_bearded_octo
-        puts '   ⚡ Some bearded-octo seasoning'
-        %x[mkdir -p bearded]
+        Logger::log("   ⚡ Some bearded-octo seasoning", Logger::INFO)
+
+        FileUtils.mkdir_p "#{Config::DIR_BEARDED}"
         %x[curl -L -s https://github.com/proximitybbdo/bearded-octo/tarball/master | tar xz --strip 1 -C bearded]
       end
 
       def get_moreorless
-        puts '   ⚡ A dash of moreorless'
-        %x[mkdir -p moreorless]
+        Logger::log("   ⚡ A dash of moreorless", Logger::INFO)
+
+        FileUtils.mkdir_p "#{Config::DIR_MOREORLESS}"
         %x[curl -L -s https://github.com/rob-bar/moreorless/tarball/master | tar xz --strip 1 -C moreorless]
       end
 
@@ -95,26 +87,27 @@ module Carb
       def cook_octaplus
         get_octaplus()
 
-        %x[cp -R octaplus/ boilerplate]
+        FileUtils.cp_r "#{Config::DIR_OCTAPLUS}", "#{Config::DIR_COOKPOT}"
       end
 
       def cook_bearded_octo
         get_bearded_octo()
         get_moreorless()
 
-        %x[rm -rf boilerplate/assets/*]
-        %x[mkdir -p boilerplate/assets]
-        %x[cp -R bearded/assets/ boilerplate/assets]
-        %x[rm -rf moreorless/tests]
-        %x[cp -R moreorless/ boilerplate/assets/css]
+        FileUtils.remove_dir "#{Config::DIR_OCTAPLUS}/assets"
+        FileUtils.mkdir_p "#{Config::DIR_COOKPOT}/assets"
+
+        FileUtils.cp_r "#{Config::DIR_BEARDED}/assets/.", "#{Config::DIR_COOKPOT}/assets"
+        FileUtils.remove_dir "#{Config::DIR_MOREORLESS}/tests"
+        FileUtils.cp_r "#{Config::DIR_MOREORLESS}/.", "#{Config::DIR_COOKPOT}/assets/css"
       end
 
       def cook_on_fire
         get_octaplus()
         cook_bearded_octo()
 
-        %x[cp -R octaplus/ boilerplate]
-        %x[cp bearded/index.html boilerplate/fuel/app/views/welcome]
+        FileUtils.cp_r "#{Config::DIR_OCTAPLUS}/.", "#{Config::DIR_COOKPOT}"
+        FileUtils.cp_r "#{Config::DIR_BEARDED}/index.html", "#{Config::DIR_COOKPOT}/fuel/app/views/welcome"
 
         # actions on the views
       end

data/lib/carb/logger.rb

@@ -0,0 +1,39 @@
+module Carb
+  class Logger
+
+    SUCCESS = 'success'
+    ERROR = 'error'
+    WARNING = 'warning'
+    INFO = 'info'
+
+    class << self
+
+      def log(text, type)
+        case type
+        when ERROR
+          output = red(text)
+        when INFO 
+          output = blue(text)
+        when SUCCESS
+          output = green(text)
+        when WARNING
+          output = grey(text)
+        else
+          output = text
+        end
+
+        puts output
+      end
+
+      def colorize(text, fg)
+        ret = "\e[#{fg}m#{text}\e[0m"
+      end
+
+      def red(text); colorize(text, 31); end
+      def green(text); colorize(text, 32); end
+      def blue(text); colorize(text, 34); end
+      def grey(text); colorize(text, 30); end
+
+    end
+  end
+end

data/lib/carb/version.rb

@@ -1,3 +1,3 @@
 module Carb
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeroen Bourgois
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-03 00:00:00 Z
+date: 2012-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: clamp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: colored
+  name: fileutils
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,20 +45,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fileutils
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 description: Boost the start of a Proximity BBDO Octaplus framework
 email: 
 - jeroenbourgois@gmail.com
@@ -70,7 +56,9 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -80,6 +68,7 @@ files:
 - lib/carb/cli.rb
 - lib/carb/config.rb
 - lib/carb/controller.rb
+- lib/carb/logger.rb
 - lib/carb/version.rb
 homepage: ""
 licenses: []