ruby_storm 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a30c6facce7f08fa3fa1c15c953608cf2898a252
-  data.tar.gz: 30e89c5be621ab385ca7c4a89dafd37c03b44380
+  metadata.gz: d6e54341bbb5cf3fa51aea16ffd82dcf84e4bbac
+  data.tar.gz: 32e916ae45c2eb96aa418c23e77a3871ee2638ca
 SHA512:
-  metadata.gz: 145aa88c61cc219856daa806b8ea993c70953b707c9802e5ca30e882cdb897d578514ee0dccc96c0d521a81c3074b761651f792c8c91ccfc2073859870cbf2a3
-  data.tar.gz: 6d2dfa844d032d2d494d42babfa7c935cc933dc9c99f9f7c2c02ab103679e3a45ac2d2aabe0809aca75e1c531f36a54d13d162ee916b94e3dec1c9fd1b9cb782
+  metadata.gz: 6ee778d5a0b8d0e182c5a66030ad2cf34a5603915a5c2515a4e5571534d6c43df9625a38b13e6f0fddb51e41e4103b4c23c9815b6db7d7c543f9f9319ba27b03
+  data.tar.gz: 7896718b8b203b732e38ddedf1d11edf523235fa891fd8f662ea90a864f7d1818beef3ab2808a5724921d8bcc4e73442502c85b4b6f8d86a4f0250dd9829b8f5

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-gem 'pry'
-gem 'jazz_hands'
 gem 'awesome_print'
 gem 'activerecord'
 gem 'sqlite3'
 gem 'thread_safe'
+gem 'pry', "~> 0.10.0"
+gem 'pry-byebug'

data/Gemfile.lock

@@ -1,109 +1,42 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    awesome_print (1.2.0)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
+    arel (6.0.0)
+    awesome_print (1.6.1)
     builder (3.2.2)
+    byebug (4.0.2)
+      columnize (= 0.9.0)
     coderay (1.1.0)
-    columnize (0.8.9)
-    coolline (0.5.0)
-      unicode_utils (~> 1.4)
-    debug_inspector (0.0.2)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
-    diff-lcs (1.2.5)
-    diffy (3.0.7)
-    erubis (2.7.0)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    hirb (0.7.2)
-    i18n (0.6.11)
-    jazz_hands (0.5.2)
-      awesome_print (~> 1.2)
-      coolline (>= 0.4.2)
-      hirb (~> 0.7.1)
-      pry (~> 0.9.12)
-      pry-debugger (~> 0.2.2)
-      pry-doc (~> 0.4.6)
-      pry-git (~> 0.2.3)
-      pry-rails (~> 0.3.2)
-      pry-remote (>= 0.1.7)
-      pry-stack_explorer (~> 0.4.9)
-      railties (>= 3.0, < 5.0)
+    columnize (0.9.0)
+    i18n (0.7.0)
     json (1.8.1)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (5.4.2)
-    posix-spawn (0.3.9)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    minitest (5.5.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.3)
-      debugger (~> 1.3)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-doc (0.4.6)
-      pry (>= 0.9)
-      yard (>= 0.8)
-    pry-git (0.2.3)
-      diffy
-      grit
-      pry (>= 0.9.8)
-    pry-rails (0.3.2)
-      pry (>= 0.9.10)
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    pry-stack_explorer (0.4.9.1)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
     slop (3.6.0)
     sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode_utils (1.4.0)
-    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -111,7 +44,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   awesome_print
-  jazz_hands
-  pry
+  pry (~> 0.10.0)
+  pry-byebug
   sqlite3
   thread_safe

data/application/application.rb

@@ -1,12 +1,25 @@
 # encoding: utf-8
 require 'fileutils'
+require_relative '../generators/version'
 
 module Storm
-  STORM_DIR = "#{File.dirname(__FILE__)}/../"
-  STORM_ENV = ENV['DATABASE_ENV'] || 'development'
-  VERSION = ENV['VERSION'] || nil
+  STORM_DIR = File.expand_path("#{File.dirname(__FILE__)}/../")
+  STORM_ENV = ENV['DATABASE_ENV']    || 'development'
+  DB_VERSION =   ENV['DB_VERSION']   || nil
   DATABASE_DIR = ENV['DATABASE_DIR'] || './db'
+  APP_NAME = ENV['APP_NAME']         || Inflector::classify(File.basename(FileUtils.pwd))
   MIGRATIONS_DIR = "#{DATABASE_DIR}/migrate"
   APP_DIR = File.expand_path("./")
-  APP_NAME = ENV['APP_NAME'] || Inflector::classify(File.basename(FileUtils.pwd))
+
+  def self.env
+    STORM_ENV
+  end
+
+  def self.version
+    Storm::Version.to_s
+  end
+
+  def self.app_name
+    APP_NAME
+  end
 end

data/bin/storm

@@ -2,6 +2,7 @@
 require 'thread_safe'
 
 module Storm
+
   require File.expand_path("./../../application/inflector", __FILE__)
   require File.expand_path("./../../application/application", __FILE__)
 
@@ -9,9 +10,15 @@ module Storm
     begin
       names = namespace.to_s.split(':')
       generator(names)
+
       if klass = generator(names)
-        puts "#{klass} #{args.length > 1 ? args[1..-1] : ''}"
-        Dir["./*/*.rb"].each{|file| require file } if klass.name != "Storm::Init"
+        Dir["./*/*.rb"].each{|file| require file } unless [
+          "Storm::Init",
+          "Storm::Console",
+          "Storm::Start",
+          "Storm::App",
+          "Storm::Version"
+        ].include? klass.name
         klass.start(args[1..-1])
       else
         puts "Could not find generator '#{names}'. "
@@ -27,9 +34,9 @@ module Storm
     generators_and_paths = names.map{|name|
       [name.capitalize,name.downcase]
     }
+
     klass = "::Storm::"+generators_and_paths.map(&:first).join("::")
     path = File.expand_path("./../../generators/#{generators_and_paths.map(&:last).join("/")}.rb", __FILE__)
-
     if File.exists?(path)
       require path
       return eval(klass)

data/generators/app.rb

@@ -0,0 +1,18 @@
+require 'fileutils'
+
+module Storm
+  class App
+    def self.start(args)
+      require 'thread_safe'
+      require 'active_record'
+      require "awesome_print"
+      require 'bundler'
+      ::Bundler.require(:default, :development)
+      Dir["./**/*.rb"].each{|file| next if /db\/migrate/ =~ file; require file }
+      project_name = File.basename(Dir.pwd)
+      class_name = Inflector::classify(project_name)
+      Inflector::constantize(class_name).send(ARGV[1], ARGV[2..-1])
+    end
+  end
+end
+

data/generators/console.rb

@@ -0,0 +1,47 @@
+module Storm
+  class Console
+
+    def self.reload!
+      @@reload = true
+      exit
+    end
+
+    def self.start(*args)
+      reload_proc = proc{ Storm::Console.start(*args) }
+
+      require 'thread_safe'
+      require 'active_record'
+      require "awesome_print"
+      require 'bundler'
+
+      ::Bundler.require(:default, :development)
+      Dir["./**/*.rb"].each{|file| next if /db\/migrate/ =~ file; require file }
+
+      require File.expand_path("./../../application/inflector", __FILE__)
+      require File.expand_path("./../../application/application", __FILE__)
+
+      ActiveRecord::Base.establish_connection YAML.load_file('./db/databases.yml')[Storm::STORM_ENV] rescue nil
+      ARGV.clear
+      begin
+        require 'pry'
+        Pry.color = true
+        load Gem.bin_path('pry', 'pry')
+      rescue Exception => e
+        if @@reload
+          @@reload = false
+          self.start(*args)
+        else
+          puts e
+          require 'irb'
+          ::IRB.start
+        end
+      end
+    end
+  end
+end
+
+class Object
+  def reload!
+    Storm::Console.reload!
+  end
+end

data/generators/db/create.rb

@@ -1,4 +1,4 @@
-require "#{Storm::STORM_DIR}/generators/db/db_command"
+require_relative "db_command"
 
 module Storm::Db
   class Create  < Storm::DBCommand

data/generators/db/drop.rb

@@ -1,4 +1,4 @@
-require "#{Storm::STORM_DIR}/generators/db/db_command"
+require_relative "db_command"
 
 module Storm::Db
   class Drop < Storm::DBCommand

data/generators/db/generate.rb

@@ -16,7 +16,7 @@ module Storm::Db
               col_type ||= "string"
               "      t.#{col_type} :#{::Inflector::singularize(::Inflector::tableize(col_name))}"
             end,
-       "      t.timestamps",
+       "      t.timestamps(null: false)",
        "     end",
        "  end",
        "end"].flatten

data/generators/db/migrate.rb

@@ -1,11 +1,11 @@
-require "#{Storm::STORM_DIR}/generators/db/db_command"
+require_relative "db_command"
 
 module Storm::Db
   class Migrate < Storm::DBCommand
     def self.start *_
       self.connect
       ::ActiveRecord::Migration.verbose = true
-      ::ActiveRecord::Migrator.migrate File.expand_path(Storm::MIGRATIONS_DIR), Storm::VERSION && Storm::VERSION.to_i
+      ::ActiveRecord::Migrator.migrate File.expand_path(Storm::MIGRATIONS_DIR), Storm::DB_VERSION && Storm::DB_VERSION.to_i
     end
   end
 end

data/generators/db/migration_generator.rb

@@ -1,5 +1,6 @@
 module Storm::Db
   class Storm::MigrationGenerator
+      require 'active_record'
     def self.next_migration_file_name(args)
       ::Inflector::tableize("#{Time.now.strftime("%Y%m%d%H%M%S")}_#{self.name.split("::").last}_#{args[0]}")+".rb"
     end

data/generators/db/rollback.rb

@@ -1,4 +1,4 @@
-require "#{Storm::STORM_DIR}/generators/db/db_command"
+require_relative "db_command"
 
 module Storm::Db
   class Rollback < Storm::DBCommand

data/generators/db/version.rb

@@ -1,4 +1,4 @@
-require "#{Storm::STORM_DIR}/generators/db/db_command"
+require_relative "db_command"
 
 module Storm::Db
   class Version < Storm::DBCommand

data/generators/init.rb

@@ -33,7 +33,7 @@ gem 'ruby_storm'
       File.open("./#{dir_name}/#{file_name}", "w+") do |f|
         f.puts "\
 class #{class_name}
-  def self.main(env)
+  def self.main(env, args)
   end
 end
   "

data/generators/start.rb

@@ -0,0 +1,18 @@
+require 'fileutils'
+
+module Storm
+  class Start
+    def self.start(args)
+      require 'thread_safe'
+      require 'active_record'
+      require "awesome_print"
+      require 'bundler'
+      ::Bundler.require(:default, :development)
+      Dir["./**/*.rb"].each{|file| next if /db\/migrate/ =~ file; require file }
+      project_name = File.basename(Dir.pwd)
+      class_name = Inflector::classify(project_name)
+      Inflector::constantize(class_name).main(STORM_ENV, ARGV[1..-1])
+    end
+  end
+end
+

data/generators/version.rb

@@ -1,8 +1,11 @@
 module Storm
   class Version
     def self.to_s(*args)
-      "0.0.4"
+      "0.0.7"
+    end
+
+    def self.start(*args)
+      puts self
     end
-    alias_method :start, :to_s
   end
 end

data/ruby_storm.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = ['stormc', 'storm']
+  s.executables   = ['storm']
 
   s.add_runtime_dependency 'pry', '~> 0.10'
-  s.add_runtime_dependency 'jazz_hands', '~> 0.5'
-  s.add_runtime_dependency 'awesome_print', '~> 1.0'
+  s.add_runtime_dependency 'pry-byebug', '~> 3.1'
+  s.add_runtime_dependency 'awesome_print', '~> 1.6'
   s.add_runtime_dependency 'activerecord', '~> 4.1'
   s.add_runtime_dependency 'sqlite3', '~> 1.3'
   s.add_runtime_dependency 'thread_safe', '~> 0.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_storm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: jazz_hands
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,6 @@ dependencies:
 description: Ruby storm is a stand alone Object Relational Mapper that wraps ActiveRecord.
 email: wouter.coppieters@youdo.co.nz
 executables:
-- stormc
 - storm
 extensions: []
 extra_rdoc_files: []
@@ -122,10 +121,9 @@ files:
 - README.md
 - application/application.rb
 - application/inflector.rb
-- application/jazz_hands.rb
 - bin/storm
-- bin/storm_console
-- bin/stormc
+- generators/app.rb
+- generators/console.rb
 - generators/db/create.rb
 - generators/db/db_command.rb
 - generators/db/drop.rb
@@ -136,6 +134,7 @@ files:
 - generators/db/rollback.rb
 - generators/db/version.rb
 - generators/init.rb
+- generators/start.rb
 - generators/version.rb
 - ruby_storm.gemspec
 - rubystorm.todo
@@ -164,4 +163,3 @@ signing_key:
 specification_version: 4
 summary: Ruby storm is a stand alone Object Relational Mapper
 test_files: []
-has_rdoc: 

data/application/jazz_hands.rb

@@ -1,58 +0,0 @@
-##
-#  Jazz Hands for console and debugging
-##
-require 'jazz_hands'
-require 'awesome_print'
-
-JazzHands.colored_prompt = true
-JazzHands.enable_syntax_highlighting_as_you_type!
-
-Pry.config.print = ->(output, value) do
-  return if JazzHands._hirb_output && Hirb::View.view_or_page_output(value)
-  pretty = value.ai(indent: 2)
-  Pry::Helpers::BaseHelpers.stagger_output("=> #{pretty}", output)
-end
-
-# Friendlier prompt - line number, app name, nesting levels look like
-# directory paths.
-#
-# Heavy use of lazy lambdas so configuration (like Pry.color) can be
-# changed later or even during console usage.
-#
-# Custom color helpers using hints \001 and \002 so that good readline
-# libraries (GNU, rb-readline) correctly ignore color codes when
-# calculating line length.
-
-name = Storm::APP_NAME
-
-color = -> { Pry.color && JazzHands.colored_prompt }
-red  = ->(text) { color[] ? "\001\e[0;31m\002#{text}\001\e[0m\002" : text.to_s }
-blue = ->(text) { color[] ? "\001\e[0;34m\002#{text}\001\e[0m\002" : text.to_s }
-bold = ->(text) { color[] ? "\001\e[1m\002#{text}\001\e[0m\002"    : text.to_s }
-
-separator = -> { red.(JazzHands.prompt_separator) }
-colored_name = -> { blue.(name) }
-
-line = ->(pry) { "[#{bold.(pry.input_array.size)}] " }
-target_string = ->(object, level) do
-  level = 0 if level < 0
-  unless (string = Pry.view_clip(object)) == 'main'
-    "(#{'../' * level}#{string})"
-  else
-    ''
-  end
-end
-
-Pry.config.prompt = [
-  ->(object, level, pry) do      # Main prompt
-    "#{line.(pry)}#{colored_name.()}#{target_string.(object, level)} #{separator.()}  "
-  end,
-  ->(object, level, pry) do      # Wait prompt in multiline input
-    spaces = ' ' * (
-      "[#{pry.input_array.size}] ".size +  # Uncolored `line.(pry)`
-      name.size +
-      target_string.(object, level).size
-    )
-    "#{spaces} #{separator.()}  "
-  end
-]

data/bin/storm_console

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-Dir["./*/*.rb"].each{|file| require file }
-
-Bundler.require(:default)
-require 'thread_safe'
-require 'pry'
-require 'active_record'
-
-require File.expand_path("./../../application/inflector", __FILE__)
-require File.expand_path("./../../application/application", __FILE__)
-require File.expand_path("./../../application/jazz_hands", __FILE__)
-
-ActiveRecord::Base.establish_connection YAML.load_file('./db/databases.yml')[Storm::STORM_ENV] rescue nil
-
-load Gem.bin_path('pry', 'pry', ">= 0.9")
-
-
-

data/bin/stormc

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-Kernel::exec "bundle exec #{File.expand_path("./../storm_console", __FILE__)}"
-
-