culpa 0.5.2 → 0.6.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFjODlhNWQyYmVlMGRjYTU4MjM4Mzc4ZjhkZWY2YzI5NGE2ZjYzOQ==
+    YjMxNzJiMjhkMzhkZjk1YmZmYmQwMWQyOGU5MDlmYjAwNWRjYzZmNA==
   data.tar.gz: !binary |-
-    YThiMTZhNDI0YzNkMDg2MTA2YTE5NTk2MzQzNDVjOTgwNWYxYjNlNQ==
+    MWZhZjM2OWJmYjMyZDc2N2M5MWY3YzE3NGFlYjliNDdlM2FhMjAxMQ==
 SHA512:
   metadata.gz: !binary |-
-    NjEzNTUxY2ZjYWE3Yzk5OTE1NTUyMzQxOTk2OTZjZDNlY2VlMGQ4ZTVmMmVh
-    MmFlY2Q1MmFiMTAzY2ExZDc3ZjA2ODY2YzMxNmVkZDlhNTg3MDZhZGVkNTc2
-    ZjBlMTBlOWQzZDg4N2NlZmJlMjAwODEzNWI0MjI4Yjk3YzEyOTk=
+    OWVkYjk0Mzg4YTY4N2UwMzRhMmI5M2UxYWZlMWE1Y2E0OWFhZWVlNzczZGM2
+    NTc3MWRlNTQwZTU4NTVlOTU2OWIxMjg2ZjAzMGQ4Y2UzYzI1ZjgwNzdjNGEy
+    MDNlNWIzZTUzYmZjZWZjMzNlZmNkY2JkNjVhZDQ5NjI4NmU0NjM=
   data.tar.gz: !binary |-
-    MWE4NDAwYTY3MGQzMWYxMDUxYzgyMDhlYzRkMjZjZTAxZTdhZDQ2ZDk4NTY4
-    ZTFhNDI1ZDQ3ZjBlZGZkNjZmYzM2MTVhODhjNDM2NTI3MGQ3NTNjNDUyNzQz
-    NzhhZTRmN2NkZDNmYzllNmU2NGQ4ZGRmMWQ1Y2UxOTIwNzg0MWY=
+    ZmQ2YjBhYWFmNmY2NjViMTM3NWUyNTRmZjY1MTQxYzRjNTI3M2Q4NDdiMWU4
+    MzFiMjc1MDRkMTBmZWYxMDMyNzM4MTQzMGRjYjUzNDI0NGU2NmZjNjZiYmU0
+    ZDY2NGEyZjRjYjFkNmI3ZmViZjhjMDA1MmUxZWFjNGE3YmRjMmY=

data/bin/culpa

@@ -45,42 +45,46 @@ def create_project(project_path)
   puts `rspec --init`
 
   puts '==> Inject Culpa helpers in spec_helper.rb'
-  File.open('spec/spec_helper.rb', 'a+') do |file|
-    file.puts("require 'culpa'")
+  spec_helper_path = 'spec/spec_helper.rb'
+  spec_helper_path_tmp = spec_helper_path + '.new'
+  File.open(spec_helper_path_tmp, 'w') do |fo|
+    fo.puts "require 'culpa'"
+    fo.puts "require 'culpa/rspec_helper'"
+    File.foreach(spec_helper_path) do |li|
+      fo.puts li
+      fo.puts "  config.include CulpaHelpers" if li == "=end\n"
+    end
   end
+  FileUtils.rm(spec_helper_path)
+  FileUtils.mv(spec_helper_path_tmp, spec_helper_path)
 end
 
 def display_help
-  puts 'Welcome to Culpa ! The MEA framework.'
+  puts "Welcome to Culpa ! The MEA framework. Version #{CULPA_VERSION}."
   puts 'Usage : culpa [command] [args 1..n]'
   puts 'Commands supported :'
-  puts '  - new [folder] : Create a new culpa project on the specified folder'
-  puts '  - console : Drop an interactive shell within the running directory'
+  puts '  - new [folder] : Creates a new culpa project on the specified folder'
+  puts '  - console : Drops an interactive shell within the running directory'
+  puts '  - server : Starts the web server'
+  puts '  - generate : '
+  puts '    - action [ActionName] [brick_a brick_b ...] : Creates an action'
+  puts '    - spec : Creates a spec'
   puts ''
   puts 'This software is distributed under the MIT license, available here : '
   puts '  - https://raw.githubusercontent.com/HipsterWhale/culpa/master/LICENSE'
   puts ''
 end
 
-def display_brick_chain
-  router_method_name = ARGV[1]
-  brickchain = Culpa::Application.new.generate_brickchain(router_method_name)
-  if brickchain
-    brickchain.each { |brick| puts " -> #{brick}" }
-  else
-    puts "Can't determine the brickchain of #{router_method_name}"
-  end
-end
-
-def generate_spec
-end
-
 def generate_action
   erb_template = File.read(File.join(File.dirname(__FILE__), '../templates/generators/action.tmpl'))
   @name = ARGV[2]
   @bricks = ARGV.drop(3)
-  renderer = ERB.new(erb_template)
-  puts renderer.result
+  rendered_action = ERB.new(erb_template).result
+end
+
+def start_server
+  require 'rack'
+  Rack::Handler.default.run(Culpa::Application.new, Port: 4748)
 end
 
 case ARGV[0]
@@ -88,12 +92,10 @@ case ARGV[0]
     create_project ARGV[1]
   when 'console', 'c'
     binding.pry
-  when 'brickchain', 'bc'
-    display_brick_chain
+  when 'server', 's'
+    start_server
   when 'generate', 'g'
     case ARGV[1]
-      when 'spec'
-        generate_spec
       when 'action'
         generate_action
       else

data/lib/culpa.rb

@@ -7,6 +7,8 @@ require 'envelope'
 require 'path_parser'
 require 'file_helpers'
 
+CULPA_VERSION='0.6.0.1'
+
 ACTIONS_PATH ||= './actions/*.rb'
 MODELS_PATH ||= './models/*.rb'
 INITIALIZERS_PATH ||= './config/initializers/*.rb'

data/lib/rspec_helper.rb

@@ -20,20 +20,20 @@ module CulpaHelpers
     end
   end
 
-end
-
-RSpec::Matchers.define :have_status do |expected|
-  match do |actual|
-    actual[:status] == Action::RETURN_CODES[expected]
+  RSpec::Matchers.define :have_status do |expected|
+    match do |actual|
+      actual[:status] == Action::RETURN_CODES[expected]
+    end
   end
-end
 
-RSpec::Matchers.define :have_headers do |expected|
-  match do |actual|
-    expected.each do |k,v|
-      return false unless actual[:headers].has_key?(k) and
-                          actual[:headers][k] == expected[k]
+  RSpec::Matchers.define :have_headers do |expected|
+    match do |actual|
+      expected.each do |k,v|
+        return false unless actual[:headers].has_key?(k) and
+                            actual[:headers][k] == expected[k]
+      end
+      true
     end
-    true
   end
+
 end

data/templates/Dockerfile

@@ -1,6 +1,9 @@
 FROM ruby:2.3
 MAINTAINER Your Name <your@email.com>
 
+# Set RACK_ENV to production
+ENV RACK_ENV production
+
 # Create app folder
 RUN mkdir -p /srv/app
 
@@ -15,5 +18,8 @@ RUN bundle install
 # Copy all applications files
 ADD ./ /srv/app
 
+# Expose culpa port
+EXPOSE 4748
+
 # Command to start the application
-CMD ["puma"]
+CMD ["/usr/local/bundle/bin/culpa", "server"]

data/templates/Gemfile

@@ -1,11 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'culpa', '~> 0.5'
+gem 'culpa', '~> 0.6'
 
 # Use rspec to test your project.
 gem 'rspec', '~> 3.4'
 
 # Use puma to serve the application.
-# Note that when you change the server the Dockerfile CMD might be broken,
-# please change it accordingly to the server you'll decide to use instead.
 gem 'puma', '~> 3.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0.1
 platform: ruby
 authors:
 - Jérémy SEBAN