cog 0.3.2 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e1f8ad2d26be0b178e872bf2bb7f4b19e5500c35
+  data.tar.gz: 88a8343d3f76b4c2f26c44d77a2b643e760a5973
+SHA512:
+  metadata.gz: a20bef1a00a8a084a0fc3274f59ecd4a7e8cb9cceb58ea4a3a23f27533e508b03fb8449e541c95bea886339eefd5aba097dc82934946c93c1ea3509836d83e6c
+  data.tar.gz: 564cc0f972a33830b20223727e733456ba7fb4ec3ec4836faecbf77b0c8ae734b564f4c5718738b1beb7317ea24cb36bed9e43b7a786d2ef27d4569ca67b695b

data/built_in/templates/cog/c++/feature.cpp.erb

@@ -1,7 +1,11 @@
 <% unless abstract? %>
 <%= return_type.to_prim %> <%= seed.name %>::<%= name %>(<%= params.collect(&:stamp_decl).join ', ' %>)
 {
-    // keep: <%= keep_name %> 
+    // keep: <%= keep_name %> {
+<% if returns_a_value? %>
+    return <%= return_type.default_lit %>;
+<% end %>
+    // keep: }
 }
 
 <% end %>

data/built_in/templates/cog/c++/feature.h.erb

@@ -1,7 +1,8 @@
+<%= access %>:
     /**
       <%= desc %> 
 <% params.each do |p| %>
       @param <%= p.name %> <%= p.desc %> 
 <% end %>
      */
-    <%= return_type.to_prim %> <%= name %>(<%= params.collect(&:stamp_decl).join ', ' %>)<% if abstract? %> = 0<% end %>;
+    <% if virtual? %>virtual <% end %><%= return_type.to_prim %> <%= name %>(<%= params.collect(&:stamp_decl).join ', ' %>)<% if abstract? %> = 0<% end %>;

data/built_in/templates/cog/c++/seed.h.erb

@@ -2,6 +2,8 @@
 
 <%= guard %> 
 
+#include <string>
+
 <% if in_scope %>
 <%= named_scope_begin in_scope %> 
 <% end %>

data/lib/cog/dsl/feature_dsl.rb

@@ -10,7 +10,7 @@ module Cog
       
       # @api developer
       def initialize(seed, name, opt={})
-        @feature = Seed::Feature.new seed, name
+        @feature = Seed::Feature.new seed, name, opt
       end
 
       # Describe what this method does in one line

data/lib/cog/dsl/seed_dsl.rb

@@ -29,8 +29,34 @@ module Cog
         feature :destructor, &block
       end
       
+      # @api_developer
+      def respond_to?(meth)
+        meth.to_s.end_with?('_feature') || super(meth)
+      end
+      
+      # @api developer
+      def method_missing(meth, *args, &block)
+        meth = meth.to_s
+        if meth.end_with? '_feature'
+          opt = args.last.is_a?(Hash) ? args.pop : {}
+          if /(?:\b|_)(public|protected|private)(?:\b|_)/ =~ meth
+            opt[:access] = $1.to_sym
+          end
+          if /(?:\b|_)(abstract|virtual)(?:\b|_)/ =~ meth
+            opt[$1.to_sym] = true
+          end
+          args << opt
+          feature(*args, &block)
+        else
+          super(meth, *args, &block)
+        end
+      end
+      
       # Define a new feature for this seed
       # @param name [String] name of the feature
+      # @option opt [Symbol] :access (:private) one of `:public`, `:protected`, or `private`
+      # @option opt [Boolean] :abstract (false) is this an abstract feature? If so, no implementation will be generated
+      # @option opt [Boolean] :virtual (false) is this a virtual feature? Virtual features can be replaced in subclasses
       # @yieldparam f [FeatureDSL] use this to further specify the feature
       # @return [nil]
       def feature(name, opt={}, &block)

data/lib/cog/language.rb

@@ -203,6 +203,32 @@ module Cog
       raise Errors::PrimitiveNotSupported.new :object => obj
     end
 
+    # @param name [Symbol] name of a primitive cog type
+    # @return [String] default value literal for the given primitive cog type
+    # @example
+    #   # For C++
+    #   lang.to_default_value :string # => '""'
+    def default_lit_for(name)
+      case name
+      when :boolean
+        to_boolean false
+      when :integer
+        to_integer 0
+      when :long
+        to_long 0
+      when :float
+        to_lit 0.0
+      when :double
+        to_double 0.0
+      when :char
+        to_char ''
+      when :string
+        to_string ''
+      when :null
+        to_null nil
+      end
+    end
+    
     private    
     
     # @api developer

data/lib/cog/native_extensions/string.rb

@@ -43,7 +43,10 @@ class String
   # @api developer
   # @return [String, String] source and type, where type is one of <tt>:project</tt>, <tt>:user</tt>, <tt>:built_in</tt>, <tt>:gem</tt>, or <tt>:unknown</tt>
   def cog_source_and_type
-    if start_with?(Cog.project_root) || start_with?(Cog.project_template_path) || start_with?(Cog.project_generator_path) || start_with?(Cog.project_plugin_path)
+    if ((Cog.project_root && start_with?(Cog.project_root)) ||
+        (Cog.project_template_path && start_with?(Cog.project_template_path)) || 
+        (Cog.project_generator_path && start_with?(Cog.project_generator_path)) ||
+        (Cog.project_plugin_path && start_with?(Cog.project_plugin_path)))
       [File.basename(Cog.project_root), :project]
     elsif start_with? Cog.user_dir
       [File.basename(ENV['HOME']), :user]

data/lib/cog/primitive.rb

@@ -12,6 +12,14 @@ class Symbol
   def to_prim
     Cog.active_language.to_prim(self)
   end
+  
+  # @return [String] assuming this symbol represents a cog primitive type, returns the literal representation of the default value for that type
+  # @example
+  #   # For Objective-C
+  #   :string.default_lit # => '@""'
+  def default_lit
+    Cog.active_language.default_lit_for(self)
+  end
 end
 
 # Helpers for {Bignum} and {Fixnum}

data/lib/cog/seed/feature.rb

@@ -6,21 +6,34 @@ module Cog
       
       include Generator
       
+      # @api developer
+      # @return [Seed] seed to which this feature belongs
       attr_reader :seed
       
+      # @return [Symbol] access modifier. One of `:public`, `:protected`, or `:private`
+      attr_reader :access
+      
       # @return [String] name of the method
       attr_reader :name
       
+      # @return [Array<Var>] list of parameters
       attr_reader :params
       
+      # @return [Symbol] the return type of the feature
       attr_reader :return_type
       
       # @api developer
-      # @param name [String] name of the method
+      # @param seed [Seed] seed to which this feature belongs
+      # @param name [String] name of the feature
+      # @option opt [Symbol] :access (:private) one of `:public`, `:protected`, or `private`
+      # @option opt [Boolean] :abstract (false) is this an abstract feature? If so, no implementation will be generated. Note that all abstract features are virtual
+      # @option opt [Boolean] :virtual (false) is this a virtual feature? Virtual features can be replaced in subclasses
       def initialize(seed, name, opt={})
         @seed = seed
         @name = name.to_s.to_ident
-        @abstract = false
+        @access = (opt[:access] || :private).to_sym
+        @abstract = !!opt[:abstract]
+        @virtual = !!opt[:virtual]
         @params = [] # [Var]
         @return_type = :void
       end
@@ -30,6 +43,16 @@ module Cog
         @abstract
       end
       
+      # @return [Boolean] is this a virtual method?
+      def virtual?
+        @abstract || @virtual
+      end
+      
+      # @return [Boolean] does this feature return a value?
+      def returns_a_value?
+        @return_type != :void
+      end
+      
       def desc
         @desc || 'Undocumented'
       end

data/lib/cog/spec_helpers/runner.rb

@@ -6,17 +6,25 @@ module Cog
     # Points to the +cog+ command-line app
     class Runner
 
-      # @param path_to_cl_app [String] path 
-      def initialize
-        @cog = File.expand_path File.join(File.dirname(__FILE__), '..', '..', '..', 'bin', 'cog')
+      # @param exec_path [String] path to the executable
+      # @option opt [Array<String>] :flags (['--colorless']) command line flags to pass each time the executable is invoked
+      # @option opt [Boolean] :use_bundler (true) Should `bundle exec` prefix each invocation of the executable?
+      def initialize(exec_path = nil, opt={})
+        @exec_path = if exec_path
+          exec_path
+        else
+          File.expand_path File.join(File.dirname(__FILE__), '..', '..', '..', 'bin', 'cog')
+        end
+        @flags = opt[:flags] || ['--colorless']
+        @use_bundler = opt[:use_bundler].nil? ? true : opt[:use_bundler]
       end
 
       # Run cog with the given arguments
       # @param args [Array<String>] arguments to pass to +cog+
       # @return [Invocation] an object which can be used with custom {Matchers}
       def run(*args)
-        args = [@cog, '--colorless'] + args
-        Invocation.new(args.collect {|x| x.to_s})
+        cmd = ([@exec_path] + @flags + args).collect &:to_s
+        Invocation.new(cmd, :use_bundler => @use_bundler)
       end
     end
     
@@ -26,9 +34,11 @@ module Cog
     class Invocation
       
       # @api developer
-      # @param cmd [Array<String>] path to +cog+ executable and arguments
+      # @param cmd [Array<String>]
+      # @option opt [Boolean] :use_bundler (false)
       def initialize(cmd, opt={})
         @cmd = cmd
+        @use_bundler = opt[:use_bundler]
       end
       
       # Execute the command
@@ -36,9 +46,10 @@ module Cog
       # @yield [stdin, stdout, stderr] standard pipes for the invocation
       # @return [nil]
       def exec(&block)
-        @cmd = ['bundle', 'exec'] + @cmd
+        full_cmd = @cmd
+        full_cmd = ['bundle', 'exec'] + full_cmd if @use_bundler
         ENV['HOME'] = SpecHelpers.active_home_fixture_dir
-        Open3.popen3 *@cmd do |i,o,e,t|
+        Open3.popen3 *full_cmd do |i,o,e,t|
           block.call i,o,e
         end
       end

data/lib/cog/version.rb

@@ -1,5 +1,5 @@
 module Cog
   unless const_defined? :VERSION
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,143 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cog
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Kevin Tonon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: active_support
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gli
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rainbow
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: kevin@betweenconcepts.com
-executables: 
+executables:
 - cog
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/cog
 - BuiltIn.cogfile
 - LICENSE
@@ -196,37 +187,26 @@ files:
 - yard-templates/default/fulldoc/html/css/common.css
 homepage: https://github.com/ktonon/cog
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is a utility to help you write code generators.
 test_files: []
-