theme-juice 0.7.8 → 0.7.9

data/lib/theme-juice/commands/delete.rb

@@ -1,51 +1,51 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module Commands
-    class Delete < Command
-
-      def initialize(opts = {})
-        super
-
-        @project.name        = @opts.fetch("name") { name }
-        @project.url         = @opts.fetch("url") { url }
-        @project.db_drop     = @opts.fetch("db_drop", false)
-        @project.vm_restart  = @opts.fetch("vm_restart", false)
-        @project.vm_root     = vm_root
-        @project.vm_location = vm_location
-        @project.vm_srv      = vm_srv
-
-        runner do |tasks|
-          tasks << Tasks::DeleteConfirm.new
-          tasks << Tasks::Database.new
-          tasks << Tasks::VMLocation.new
-          tasks << Tasks::SyncedFolder.new
-          tasks << Tasks::DNS.new
-          tasks << Tasks::DeleteSuccess.new
-        end
-      end
-
-      private
-
-      def name
-        name = @io.prompt "What's the project name?"
-
-        unless @list.projects.include? name
-          @io.error "Project '#{name}' doesn't exist"
-        end
-
-        name
-      end
-
-      def url
-        url = @io.prompt "What is the project's development url?", :default => "#{@project.name}.dev"
-
-        unless @list.urls.include? url
-          @io.notice "Project url '#{url}' doesn't exist within DNS records. Skipping..."
-        end
-
-        url
-      end
-    end
-  end
-end
+# encoding: UTF-8
+
+module ThemeJuice
+  module Commands
+    class Delete < Command
+
+      def initialize(opts = {})
+        super
+
+        @project.name        = @opts.fetch("name") { name }
+        @project.url         = @opts.fetch("url") { url }
+        @project.db_drop     = @opts.fetch("db_drop", false)
+        @project.vm_restart  = @opts.fetch("vm_restart", false)
+        @project.vm_root     = vm_root
+        @project.vm_location = vm_location
+        @project.vm_srv      = vm_srv
+
+        runner do |tasks|
+          tasks << Tasks::DeleteConfirm.new
+          tasks << Tasks::Database.new
+          tasks << Tasks::VMLocation.new
+          tasks << Tasks::SyncedFolder.new
+          tasks << Tasks::DNS.new
+          tasks << Tasks::DeleteSuccess.new
+        end
+      end
+
+      private
+
+      def name
+        name = @io.prompt "What's the project name?"
+
+        unless @list.projects.include? name
+          @io.error "Project '#{name}' doesn't exist"
+        end
+
+        name
+      end
+
+      def url
+        url = @io.prompt "What is the project's development url?", :default => "#{@project.name}.dev"
+
+        unless @list.urls.include? url
+          @io.notice "Project url '#{url}' doesn't exist within DNS records. Skipping..."
+        end
+
+        url
+      end
+    end
+  end
+end

data/lib/theme-juice/commands/deploy.rb

@@ -1,20 +1,20 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module Commands
-    class Deploy < Command
-
-      def initialize(opts = {})
-        super
-
-        @project.vm_root     = vm_root
-        @project.vm_location = vm_location
-        @project.vm_srv      = vm_srv
-
-        runner do |tasks|
-          @io.error "Not implemented"
-        end
-      end
-    end
-  end
-end
+# encoding: UTF-8
+
+module ThemeJuice
+  module Commands
+    class Deploy < Command
+
+      def initialize(opts = {})
+        super
+
+        @project.vm_root     = vm_root
+        @project.vm_location = vm_location
+        @project.vm_srv      = vm_srv
+
+        runner do |tasks|
+          @io.error "Not implemented"
+        end
+      end
+    end
+  end
+end

data/lib/theme-juice/config.rb

@@ -1,68 +1,68 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module Config
-    @env     = Env
-    @io      = IO
-    @project = Project
-    @util    = Util.new
-
-    def method_missing(method, *args, &block)
-      @project.location ||= Dir.pwd
-
-      begin
-        config.fetch("commands", {})
-          .fetch("#{method}") { @io.error("Command '#{method}' not found in config") }
-          .each { |cmd| run format_command(cmd, *args) }
-      rescue ::NoMethodError => err
-        @io.error "Config file is invalid" do
-          puts err
-        end
-      end
-    end
-
-    private
-
-    def run(command)
-      @util.inside @project.location do
-        @util.run command, :verbose => @env.verbose
-      end
-    end
-
-    def format_command(cmd, args = [])
-      if multi_arg_regex =~ cmd
-        cmd.gsub! multi_arg_regex, args.join(" ")
-      else
-        args.to_enum.with_index(1).each do |arg, i|
-          cmd.gsub! single_arg_regex(i), arg
-        end
-      end
-      cmd
-    end
-
-    def config
-      begin
-        YAML.load_file Dir["#{@project.location}/*"].select { |f| config_regex =~ File.basename(f) }.last ||
-          @io.error("Config file not found in '#{@project.location}'")
-      rescue ::Psych::SyntaxError => err
-        @io.error "Config file contains invalid YAML" do
-          puts err
-        end
-      end
-    end
-
-    def config_regex
-      %r{^(((\.)?(tj)|((J|j)uicefile))(.y(a)?ml)?$)}
-    end
-
-    def multi_arg_regex
-      %r{(%args%)|(%arguments%)}
-    end
-
-    def single_arg_regex(i)
-      %r{(%arg#{i}%)|(%argument#{i}%)}
-    end
-
-    extend self
-  end
-end
+# encoding: UTF-8
+
+module ThemeJuice
+  module Config
+    @env     = Env
+    @io      = IO
+    @project = Project
+    @util    = Util.new
+
+    def method_missing(method, *args, &block)
+      @project.location ||= Dir.pwd
+
+      begin
+        config.fetch("commands", {})
+          .fetch("#{method}") { @io.error "Command '#{method}' not found in config", NotImplementedError }
+          .each { |cmd| run format_command(cmd, *args) }
+      rescue ::NoMethodError => err
+        @io.error "Config file is invalid", SyntaxError do
+          puts err
+        end
+      end
+    end
+
+    private
+
+    def run(command)
+      @util.inside @project.location do
+        @util.run command, :verbose => @env.verbose
+      end
+    end
+
+    def format_command(cmd, args = [])
+      if multi_arg_regex =~ cmd
+        cmd.gsub! multi_arg_regex, args.join(" ")
+      else
+        args.to_enum.with_index(1).each do |arg, i|
+          cmd.gsub! single_arg_regex(i), arg
+        end
+      end
+      cmd
+    end
+
+    def config
+      begin
+        YAML.load_file Dir["#{@project.location}/*"].select { |f| config_regex =~ File.basename(f) }.last ||
+          @io.error("Config file not found in '#{@project.location}'")
+      rescue ::Psych::SyntaxError => err
+        @io.error "Config file contains invalid YAML", SyntaxError do
+          puts err
+        end
+      end
+    end
+
+    def config_regex
+      %r{^(((\.)?(tj)|((J|j)uicefile))(.y(a)?ml)?$)}
+    end
+
+    def multi_arg_regex
+      %r{(%args%)|(%arguments%)}
+    end
+
+    def single_arg_regex(i)
+      %r{(%arg#{i}%)|(%argument#{i}%)}
+    end
+
+    extend self
+  end
+end

data/lib/theme-juice/env.rb

@@ -1,25 +1,25 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module Env
-    attr_accessor :vm_path
-    attr_accessor :vm_ip
-    attr_accessor :yolo
-    attr_accessor :boring
-    attr_accessor :no_unicode
-    attr_accessor :no_colors
-    attr_accessor :no_animations
-    attr_accessor :no_landrush
-    attr_accessor :vm_prefix
-    attr_accessor :verbose
-    attr_accessor :dryrun
-
-    def inspect
-      res = []
-      self.instance_variables.each { |k, _| res << "#{k[1..-1]}: #{instance_variable_get(k)}" }
-      res.sort
-    end
-
-    extend self
-  end
-end
+# encoding: UTF-8
+
+module ThemeJuice
+  module Env
+    attr_accessor :vm_path
+    attr_accessor :vm_ip
+    attr_accessor :vm_prefix
+    attr_accessor :no_unicode
+    attr_accessor :no_colors
+    attr_accessor :no_animations
+    attr_accessor :no_landrush
+    attr_accessor :boring
+    attr_accessor :yolo
+    attr_accessor :verbose
+    attr_accessor :dryrun
+
+    def inspect
+      res = []
+      self.instance_variables.each { |k, _| res << "#{k[1..-1]}: #{instance_variable_get(k)}" }
+      res.sort
+    end
+
+    extend self
+  end
+end

data/lib/theme-juice/io.rb

@@ -1,323 +1,295 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module IO
-    include Thor::Shell
-
-    ICONS = {
-      :success             => "✓", # "\u2713",
-      :error               => "↑", # "\u2191",
-      :notice              => "→", # "\u2192",
-      :question            => "•", # "\u2022",
-      :general             => "›", # "\u203A",
-      :log                 => "…", # "\u2026",
-      :restart             => "↪", # "\u21AA",
-      :selected            => "•", # "\u2022",
-      :unselected          => "○", # "\u25CB",
-      :fallback_success    => "+",
-      :fallback_error      => "!",
-      :fallback_notice     => "!",
-      :fallback_question   => "?",
-      :fallback_general    => "-",
-      :fallback_log        => "...",
-      :fallback_restart    => "!",
-      :fallback_selected   => "[x]",
-      :fallback_unselected => "[ ]",
-    }
-
-    KEYS = {
-      "\e[A" => "up",
-      "\e[B" => "down",
-      "\e[C" => "right",
-      "\e[D" => "left",
-      "\003" => "ctrl+c",
-      "\004" => "ctrl+d",
-      "\e"   => "escape",
-      "\n"   => "linefeed",
-      "\r"   => "return",
-      " "    => "space",
-    }
-
-    @state = nil
-    @env = Env
-
-    def speak(message, opts = {})
-      format_message message, opts
-      output_message
-    end
-
-    def prompt(question, *opts)
-      format_message question, {
-        :color => :blue,
-        :icon  => :question
-      }
-
-      opts.each do |opt|
-
-        # if opt[:default]
-        #   opt[:default] = set_color(opt[:default], :black, :bold) unless @env.no_colors
-        # end
-
-        if opt[:indent]
-          with(question) { |str| (" " * opt[:indent]) << str }
-        end
-
-        break
-      end
-
-      ask("#{question} :", *opts).gsub /\e\[\d+m/, ""
-    end
-
-    def agree?(question, opts = {})
-      format_message question, {
-        :color => opts.fetch("color", :blue),
-        :icon  => :question
-      }
-
-      if opts[:simple]
-        yes? " :", opts.fetch("color", {})
-      else
-        yes? "#{question} (y/N) :"
-      end
-    end
-
-    def log(message)
-      speak message, {
-        :color => :yellow,
-        :icon  => :log
-      }
-    end
-
-    def success(message)
-      speak message, {
-        :color => [:black, :on_green, :bold],
-        :icon  => :success,
-        :row   => true
-      }
-    end
-
-    def notice(message)
-      speak message, {
-        :color => [:black, :on_yellow],
-        :icon  => :notice,
-        :row   => true
-      }
-    end
-
-    def error(message)
-      speak message, {
-        :color => [:white, :on_red],
-        :icon  => :error,
-        :row   => true
-      }
-
-      yield if block_given?
-
-      exit 1
-    end
-
-    def hello(opts = {})
-      speak "Welcome to Theme Juice!", {
-        :color => [:black, :on_green, :bold],
-        :row   => true
-      }.merge(opts)
-    end
-
-    def goodbye(opts = {})
-
-      # Have some fun?
-      goodbyes = [
-        "Bye, bye, bye",
-        "Adios, muchachos",
-        "See ya later, alligator",
-        "Peace...",
-        "Later, homes",
-        "I'll be back",
-        "Victory is ours!",
-        "May the force be with you",
-        "Take a break, man...",
-        "It's not me, it's you",
-        "Go home, developer, you're drunk",
-        "Okay, this is getting a little out of hand...",
-        "I don't like it when you press my buttons",
-        "Ouch!",
-        ":(",
-      ]
-
-      speak goodbyes.sample, {
-        :color   => :yellow,
-        :newline => true
-      }.merge(opts)
-
-      exit 130
-    end
-
-    def open_project(url)
-      speak "Do you want to open up your new project at 'http://#{url}' now? (y/N)", {
-        :color => [:black, :on_blue],
-        :icon  => :restart,
-        :row   => true
-      }
-
-      if agree? "", { :simple => true }
-        OS.open_file_command "http://#{url}"
-      end
-    end
-
-    def list(header, color, list)
-      speak header, {
-        :color => [:black, :"on_#{color}"],
-        :icon  => :notice,
-        :row   => true
-      }
-
-      list.each do |item|
-        speak item, {
-          :color => :"#{color}",
-          :icon  => :general
-        }
-      end
-    end
-
-    def choose(header, color, list)
-      if OS.windows?
-        ask header, {
-          :limited_to => list,
-          :color      => color
-        }
-      else
-        speak "#{header} (use arrow keys and press enter)", {
-          :color => :"#{color}",
-          :icon  => :question
-        }
-
-        print "\n" * list.size
-
-        selected = 0
-        update_list_selection(list, color, selected)
-
-        loop do
-          key = read_key
-          case key
-          when "up"
-            selected -= 1
-            selected = list.size - 1 if selected < 0
-            update_list_selection(list, color, selected)
-          when "down"
-            selected += 1
-            selected = 0 if selected > list.size - 1
-            update_list_selection(list, color, selected)
-          when "return", "linefeed", "space"
-            return list[selected]
-          when "esc", "ctrl+c"
-            goodbye(:newline => false)
-          # else
-          #   speak key.inspect, { :color => :yellow }
-          end
-        end
-      end
-    end
-
-    private
-
-    def update_list_selection(list, color, selected = 0)
-      print "\e[#{list.size}A"
-
-      list.each_with_index do |item, i|
-        icon = i == selected ? "selected" : "unselected"
-        speak "#{item}", {
-          :color  => :"#{color}",
-          :icon   => :"#{icon}",
-          :indent => 2
-        }
-      end
-    end
-
-    #
-    # @see http://www.alecjacobson.com/weblog/?p=75
-    #
-    def read_key
-      save_stty_state
-      raw_stty_mode
-
-      key = STDIN.getc.chr
-
-      if key == "\e"
-        thread = Thread.new { key += STDIN.getc.chr + STDIN.getc.chr }
-        thread.join(0.001)
-        thread.kill
-      end
-
-      KEYS[key] || key
-    ensure
-      restore_stty_state
-    end
-
-    def save_stty_state
-      @state = %x(stty -g)
-    end
-
-    def raw_stty_mode
-      %x(stty raw -echo)
-    end
-
-    def restore_stty_state
-      %x(stty #{@state})
-    end
-
-    def format_message(message, opts = {})
-      @message, @opts = message, opts
-
-      format_message_icon
-      format_message_newline
-      format_message_row
-      format_message_width
-      format_message_color
-      format_message_indent
-
-      @message
-    end
-
-    def with(string)
-      str = yield(string); string.clear; string << str
-    end
-
-    def format_message_icon
-      icon = @env.no_unicode ? "fallback_#{@opts[:icon]}" : "#{@opts[:icon]}"
-
-      if @opts[:icon]
-        with(@message) { |msg| "#{ICONS[:"#{icon}"]}" << (@opts[:empty] ? nil : " #{msg}") }
-      else
-        with(@message) { |msg| "" << msg }
-      end
-    end
-
-    def format_message_newline
-      with(@message) { |msg| "\n" << msg } if @opts[:newline]
-    end
-
-    def format_message_color
-      unless @env.no_colors
-        with(@message) { |msg| set_color(msg, *@opts[:color]) } if @opts[:color]
-      end
-    end
-
-    def format_message_row
-      with(@message) { |msg| msg.ljust(terminal_width) } if @opts[:row]
-    end
-
-    def format_message_width
-      with(@message) { |msg| msg.ljust(@opts[:width]) } if @opts[:width]
-    end
-
-    def format_message_indent
-      with(@message) { |str| (" " * @opts[:indent]) << str } if @opts[:indent]
-    end
-
-    def output_message
-      @opts[:quiet] ? @message : say(@message)
-    end
-
-    extend self
-  end
-end
+# encoding: UTF-8
+
+module ThemeJuice
+  module IO
+    include Thor::Shell
+
+    ICONS = {
+      :success             => "✓", # "\u2713",
+      :error               => "↑", # "\u2191",
+      :notice              => "→", # "\u2192",
+      :question            => "•", # "\u2022",
+      :general             => "›", # "\u203A",
+      :log                 => "…", # "\u2026",
+      :restart             => "↪", # "\u21AA",
+      :selected            => "•", # "\u2022",
+      :unselected          => "○", # "\u25CB",
+      :fallback_success    => "+",
+      :fallback_error      => "!",
+      :fallback_notice     => "!",
+      :fallback_question   => "?",
+      :fallback_general    => "-",
+      :fallback_log        => "...",
+      :fallback_restart    => "!",
+      :fallback_selected   => "[x]",
+      :fallback_unselected => "[ ]",
+    }
+
+    KEYS = {
+      "\e[A" => "up",
+      "\e[B" => "down",
+      "w"    => "w",
+      "s"    => "s",
+      "\003" => "ctrl+c",
+      "\004" => "ctrl+d",
+      "\e"   => "escape",
+      "\n"   => "linefeed",
+      "\r"   => "return",
+      " "    => "space",
+    }
+
+    @env = Env
+    @sel = 0
+
+    def speak(message, opts = {})
+      format_message message, opts
+      output_message
+    end
+
+    def prompt(question, *opts)
+      format_message question, {
+        :color => :blue,
+        :icon  => :question
+      }
+
+      opts.each do |opt|
+
+        # if opt[:default]
+        #   opt[:default] = set_color(opt[:default], :black, :bold) unless @env.no_colors
+        # end
+
+        if opt[:indent]
+          with(question) { |str| (" " * opt[:indent]) << str }
+        end
+
+        break
+      end
+
+      ask("#{question} :", *opts).gsub /\e\[\d+m/, ""
+    end
+
+    def agree?(question, opts = {})
+      format_message question, {
+        :color => opts.fetch("color", :blue),
+        :icon  => :question
+      }
+
+      if opts[:simple]
+        yes? " :", opts.fetch("color", {})
+      else
+        yes? "#{question} (y/N) :"
+      end
+    end
+
+    def log(message)
+      speak message, {
+        :color => :yellow,
+        :icon  => :log
+      }
+    end
+
+    def success(message)
+      speak message, {
+        :color => [:black, :on_green, :bold],
+        :icon  => :success,
+        :row   => true
+      }
+    end
+
+    def notice(message)
+      speak message, {
+        :color => [:black, :on_yellow],
+        :icon  => :notice,
+        :row   => true
+      }
+    end
+
+    def error(message, code = SystemExit)
+      speak message, {
+        :color => [:white, :on_red],
+        :icon  => :error,
+        :row   => true
+      }
+
+      yield if block_given?
+
+      raise code
+    end
+
+    def hello(opts = {})
+      speak "Welcome to Theme Juice!", {
+        :color => [:black, :on_green, :bold],
+        :row   => true
+      }.merge(opts)
+    end
+
+    def goodbye(opts = {})
+      goodbyes = [
+        "Bye, bye, bye",
+        "Adios, muchachos",
+        "See ya later, alligator",
+        "Peace...",
+        "Later, homes",
+        "I'll be back",
+        "Victory is ours!",
+        "May the force be with you",
+        "Take a break, man...",
+        "It's not me, it's you",
+        "Go home, developer, you're drunk",
+        "Okay, this is getting a little out of hand...",
+        "I don't like it when you press my buttons",
+        "Ouch!",
+        ":(",
+      ]
+
+      speak goodbyes.sample, {
+        :color   => :yellow,
+        :newline => true
+      }.merge(opts)
+
+      exit 1
+    end
+
+    def list(header, color, list)
+      speak header, {
+        :color => [:black, :"on_#{color}"],
+        :icon  => :notice,
+        :row   => true
+      }
+
+      list.each do |item|
+        speak item, {
+          :color => :"#{color}",
+          :icon  => :general
+        }
+      end
+    end
+
+    def choose(header, color, list)
+      speak "#{header} (#{choose_instructions})", {
+        :color => :"#{color}",
+        :icon  => :question
+      }
+
+      list.each { puts }
+      update_selection list, color
+
+      loop do
+        key = read_key
+        case key
+        when "up", "w"
+          update_selection list, color, -1
+        when "down", "s"
+          update_selection list, color, 1
+        when "return", "linefeed", "space"
+          return list[@sel]
+        when "esc", "ctrl+c"
+          goodbye :newline => false
+        # else
+        #   speak key.inspect, { :color => :yellow }
+        end
+      end
+    end
+
+    private
+
+    def choose_instructions
+      if OS.windows?
+        "use WASD keys and press space"
+      else
+        "use arrow keys and press enter"
+      end
+    end
+
+    def update_selection(list, color, diff = 0)
+      list.each { print "\e[1A" }
+
+      @sel += diff
+      @sel = 0 if @sel > list.size - 1
+      @sel = list.size - 1 if @sel < 0
+
+      list.each_with_index do |item, i|
+        icon = i == @sel ? "selected" : "unselected"
+        speak "#{item}", {
+          :color  => :"#{color}",
+          :icon   => :"#{icon}",
+          :indent => 2
+        }
+      end
+    end
+
+    def read_key
+      $stdin.noecho do |io|
+        io.raw!
+
+        key = io.getc.chr
+
+        if key == "\e"
+          key << io.getc.chr rescue nil
+          key << io.getc.chr rescue nil
+        end
+
+        io.cooked!
+
+        KEYS[key] || key
+      end
+    end
+
+    def format_message(message, opts = {})
+      @message, @opts = message, opts
+
+      format_message_icon
+      format_message_newline
+      format_message_row
+      format_message_width
+      format_message_color
+      format_message_indent
+
+      @message
+    end
+
+    def with(string)
+      str = yield(string); string.clear; string << str
+    end
+
+    def format_message_icon
+      icon = @env.no_unicode ? "fallback_#{@opts[:icon]}" : "#{@opts[:icon]}"
+
+      if @opts[:icon]
+        with(@message) { |msg| "#{ICONS[:"#{icon}"]}" << (@opts[:empty] ? nil : " #{msg}") }
+      else
+        with(@message) { |msg| "" << msg }
+      end
+    end
+
+    def format_message_newline
+      with(@message) { |msg| "\n" << msg } if @opts[:newline]
+    end
+
+    def format_message_color
+      unless @env.no_colors
+        with(@message) { |msg| set_color(msg, *@opts[:color]) } if @opts[:color]
+      end
+    end
+
+    def format_message_row
+      unless OS.windows?
+        with(@message) { |msg| msg.ljust(terminal_width) } if @opts[:row]
+      end
+    end
+
+    def format_message_width
+      with(@message) { |msg| msg.ljust(@opts[:width]) } if @opts[:width]
+    end
+
+    def format_message_indent
+      with(@message) { |str| (" " * @opts[:indent]) << str } if @opts[:indent]
+    end
+
+    def output_message
+      @opts[:quiet] ? @message : say(@message)
+    end
+
+    extend self
+  end
+end