fox 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857965e1b8fd0f5c481aa1675971cb6e6479cec3
-  data.tar.gz: 0e1b11db7c1a364d0ee09eea0a2bbdfcf092d8d5
+  metadata.gz: be5201a58f9e94288879c098b0533b809cb74c99
+  data.tar.gz: eca1fcc17a0d10eb7a6b6bc7171974fd9dcd58fa
 SHA512:
-  metadata.gz: 31e854ae25a1280da10618176c53d4edba426e9b2e3b6f598bb1d5dbbeb671bd2e265ff0e6e150ae4c7b5aad630e7c69f2f9118ca16781c5258f692c925d7b4f
-  data.tar.gz: 8174e3766090b9d87a1649a1f4a08bd305829dcea65b4c8b10773eedac3c0fb0522c93b7b901cb50ec74cce5be625abc747b0d9489e4f6875a4da121476e8695
+  metadata.gz: 4420c104c34d227a3a4c4b034733651e3450fc79971b15fcd80559fc6b9b64e2a545894a05437b58eace85219d9d9c67456e3943f95e6496c9b024b396bfd11a
+  data.tar.gz: 4ba92ae15573ea3b32f5fec01a0de4b191520f1ffcfe056886cff8dae9245b5d780f14fdd4652886ac730f6426b15c54d8c490ebf7d34bccb7e39feb812c1def

data/bin/fox

@@ -4,9 +4,6 @@
 $LOAD_PATH << '.'
 $LOAD_PATH << 'lib'
 
-$LOAD_PATH << File.expand_path("#{File.expand_path('../..', __FILE__)}/lib/fox/messages")
-$LOAD_PATH << File.expand_path("#{File.expand_path('../..', __FILE__)}/lib/fox/service")
-
 # System includes
 require 'bundler'
 
@@ -16,27 +13,23 @@ require 'thor/runner'
 
 # Development Mode?
 if ENV["FOX_ENV"] == "development"
-    require "simplecov"
+  require "simplecov"
 
-    # Ensure merging of subprocesses by giving them a special name
-    # SimpleCov.command_name ARGV.join(" ")
-    SimpleCov.command_name "Fox #{Process.pid}"
+  # Ensure merging of subprocesses by giving them a special name
+  # SimpleCov.command_name ARGV.join(" ")
+  SimpleCov.command_name "Fox #{Process.pid}"
 
-    # Set the correct root folder for SimpleCov
-    SimpleCov.root File.join(File.expand_path(File.dirname(__FILE__)), "..")
+  # Set the correct root folder for SimpleCov
+  SimpleCov.root File.join(File.expand_path(File.dirname(__FILE__)), "..")
 
-    # Start coverage
-    SimpleCov.start
+  # Start coverage
+  SimpleCov.start
 end # of if ENV
 
-
-# Fox::Runner.new( ARGV.dup ).execute!
-$thor_runner            = true
-
-require File.expand_path("#{File.expand_path('../..', __FILE__)}/lib/fox/cli")
-
-$thor_runner = true
-CLI.start
-
+require 'fox'
+# require File.expand_path("#{File.expand_path('../..', __FILE__)}/lib/fox/cli")
+# CLI.start
+# $thor_runner            = true
+Fox::Runner.new(ARGV.dup).execute!
 
 # vim:ts=2:tw=100:wm=100:syntax=ruby

data/fox.gemspec

@@ -82,6 +82,7 @@ Gem::Specification.new do |spec|
 
   # General
   spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'bundler'
 
   # Package building
   spec.add_runtime_dependency 'fpm'

data/lib/fox.rb

@@ -7,32 +7,37 @@ require 'rake'
 require 'ruby-try'
 
 
-# @module         module Fox
-# @brief          Fox modules and classes namespace
-module Fox
-
-    require_relative 'fox/version'
-    require_relative 'fox/error'
-
-    # @module     module Mixin
-    # @brief      Mixin module contains various functions to be used in other components
-    module Mixin
-
-        # autoload :Guess, 'fox/mixin/'
-
-    end # of module Mixing
-
-    # autoload :Cache,      'fox/library/cache'
-    # autoload :Choice,     'fox/library/choice'
-
-
-    DEFAULT_CONFIG      = '.fox/config.yaml'.freeze
-
-    class << self
-    end # of class << self
-
-end # of module Fox
-
-Default.start
+require_relative "fox/runner"
+require_relative "fox/version"
+
+# Load all Thor/Rake file tasks
+#Dir.glob( "fox/interface/thor/**/*.{thor,rb}" ) { |name| Thor::Util.load_thorfile name }
+#Dir.glob( "fox/interface/rake/**/*.{rake,rb}" ) { |name| load name }
+
+
+# # @module         module Fox
+# # @brief          Fox modules and classes namespace
+# module Fox
+# 
+#   require_relative 'fox/version'
+#   # require_relative 'fox/error'
+# 
+#   # # @module     module Mixin
+#   # # @brief      Mixin module contains various functions to be used in other components
+#   # module Mixin
+# 
+#   #   # autoload :Guess, 'fox/mixin/'
+# 
+#   # end # of module Mixing
+# 
+#   # autoload :Cache,      'fox/library/cache'
+#   # autoload :Choice,     'fox/library/choice'
+# 
+#   # class << self
+#   # end # of class << self
+# 
+# end # of module Fox
+# 
+# # Default.start
 
 # vim:ts=2:tw=100:wm=100:syntax=ruby

data/lib/fox/cli.rb

@@ -6,12 +6,42 @@ require "thor"
 # Custom
 require File.expand_path(File.dirname(__FILE__) + '/interface/thor/version')
 require File.expand_path(File.dirname(__FILE__) + '/interface/thor/configuration')
+require File.expand_path(File.dirname(__FILE__) + '/interface/thor/pomodoro')
+require File.expand_path(File.dirname(__FILE__) + '/interface/thor/new')
+require File.expand_path(File.dirname(__FILE__) + '/interface/thor/info')
 
 
-class CLI < Thor
+module Fox
 
-  register(Version, 'version', 'version [something]', "Show current version")
-  register(Configuration, 'config', 'config [something]', "Type for work with fox config")
+  # @class  Fox CLI Class
+  # @brief  Implements the Fox CLI interface
+  class Cli < Thor
 
-end
+    include Thor::Actions
 
+    package_name "Fox"
+
+    register Pomodoro, "pomodoro", "pomodoro [options]", "Pomodoro clock to help you concentrate"
+    tasks["pomodoro"].options  = Pomodoro.class_options
+
+    register New, "new", "new [options]", "Create new paper project"
+    tasks["new"].options = New.class_options
+
+    register Info, "info", "info [options]", "Show information about Fox and its environment"
+    tasks["info"].options    = Info.class_options
+
+    register Configuration, "configuration", "configuration [options]", "Handle global and directory local configurations"
+    tasks["configuration"].options    = Configuration.class_options
+
+  end # of Class Cli
+
+end # of Module Fox
+
+#class CLI < Thor
+#  register(Version, 'version', 'version [something]', "Show current version")
+#  register(Configuration, 'config', 'config [something]', "Type for work with fox config")
+#  register(Pomodoro, 'pomodoro', 'pomodoro [something]', "Pomodoro clock to help you concentrate")
+#  register(New, 'new', 'new [something]', "Bookstrap new scientific paper project")
+#
+#end
+#

data/lib/fox/runner.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+
+# Custom
+require_relative 'cli'
+
+
+# @module   Fox Module
+# @brief    Implements the Fox application
+module Fox
+
+  # @class  Fox Runner Class
+  # @brief  Allow everything to be injected while defaulting to normal implementations.
+  class Runner
+
+    # @fn       def initialize {{{
+    # @brief    Construct the entry point with the signature needed for injection.
+    #
+    # @param    [Array]         argv
+    # @param    [IO]            stdin
+    # @param    [IO]            stdout
+    # @param    [IO]            stderr
+    # @param    [Kernel]        kernel
+    def initialize argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel
+      @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    end # }}}
+
+    # @fn       def execute! {{{
+    # @brief    Run our normal Thor app the way we know and love.
+    def execute!
+      exit_code = begin
+        # Thor accesses these streams directly rather than letting them be injected, so we replace them.
+        $stderr = @stderr
+        $stdin  = @stdin
+        $stdout = @stdout
+
+        # Fox::Cfg.load_configuration!
+        Fox::Cli.start(@argv)
+
+        # Thor::Base#start does not have a return value, assume success if no exception is raised.
+        0
+      rescue Exception => e
+        # Proxy any exception that comes out of Thor itself back to stderr.
+        $stderr.write(e.message + "\n")
+
+        # Exit with a failure code.
+        1
+      ensure
+        # ...then we put them back.
+        $stderr = STDERR
+        $stdin  = STDIN
+        $stdout = STDOUT
+      end
+
+      # Proxy our exit code back to the injected kernel.
+      @kernel.exit(exit_code)
+    end # }}}
+
+  end # of Class Runner
+
+end # of Module Fox
+
+# vim:ts=2:tw=100:wm=100:syntax=ruby

data/lib/fox/version.rb

@@ -3,7 +3,7 @@
 
 # @module   Fox Module
 # @brief    Implements the Fox module wrapper around the Fox API
-class Fox
+module Fox
 
   # Version of gem
   VERSION = `git describe --tags`.split("-").first || "0.1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fox
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Bjoern Rennhak
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
@@ -415,7 +429,7 @@ files:
 - lib/fox/interface/thor/configuration.rb
 - lib/fox/interface/thor/create.rb
 - lib/fox/interface/thor/default.rb
-- lib/fox/interface/thor/info.thor
+- lib/fox/interface/thor/info.rb
 - lib/fox/interface/thor/init.rb
 - lib/fox/interface/thor/mixin/audio.rb
 - lib/fox/interface/thor/mixin/config.rb
@@ -434,13 +448,14 @@ files:
 - lib/fox/interface/thor/mixin/model.rb
 - lib/fox/interface/thor/mixin/network.rb
 - lib/fox/interface/thor/mixin/shell.rb
-- lib/fox/interface/thor/new.thor
-- lib/fox/interface/thor/pomodoro.thor
+- lib/fox/interface/thor/new.rb
+- lib/fox/interface/thor/pomodoro.rb
 - lib/fox/interface/thor/version.rb
 - lib/fox/library/choice.rb
 - lib/fox/library/logger.rb
 - lib/fox/library/project_builder.rb
 - lib/fox/library/secure_config.rb
+- lib/fox/runner.rb
 - lib/fox/version.rb
 - spec/fox_spec.rb
 - spec/spec_helper.rb