ryb 0.1.3.1 → 0.2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c37eb74ab4aa31a58071a356dff44041cfa4000d
-  data.tar.gz: 1116619e3d5385d7790a94dfe93ac20caa12f7a1
+  metadata.gz: 63cc2afcc3bcab179722908bb5c2911804211e2b
+  data.tar.gz: a17dcbb8a42d284a855c0edc0e48640933cbdc19
 SHA512:
-  metadata.gz: a8c98f3febbc6728f0b45dbf424c61cfcbcde68323fc6106768587dba05cb7297459f791a1db7f50d97c42ca3c97a7baa8ba294a135da9b6b742ea6905d79ecc
-  data.tar.gz: 481325cc2ffcd087664cf7137ca807a15cec70152013b50b32aa6c5d729d5b1804c7200ed61d1e2879b352429d65e458ffd4dc7d7228b00ad4fdcf839608821b
+  metadata.gz: de79d590fb5c07e18a3ed6acb8574174a970e6b00d0df7f1c7244fe304dd80db13277523c6c0271e0b35ff2f1c2e5f82098ab52bdffa7faeecd52f8dbf992d02
+  data.tar.gz: b200c8f3fd29689fa70962ce4fe3d3003c197f6c26ea2793a4e9c88277a14b4a29f8b03e58b71b8b0ef820a0ed8fad3731f6d39059968794d0bbc3936d6f68fb

data/Gemfile.lock

@@ -1,76 +1,65 @@
 PATH
   remote: .
   specs:
-    ryb (0.0.0.dev)
-      facets
-      gli
+    ryb (0.2.0.1)
+      gli (~> 2)
+      hashie
       ninja-gen
-      xcodeproj
+      pour
+      visual_studio
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    aruba (0.8.1)
+    aruba (0.13.0)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
       rspec-expectations (>= 2.99)
+      thor (~> 0.19)
     builder (3.2.2)
-    childprocess (0.5.6)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    claide (0.9.1)
-    colored (1.2)
-    contracts (0.11.0)
-    cucumber (2.0.2)
+    contracts (0.13.0)
+    cucumber (2.3.2)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.2.0)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.2.0)
-      gherkin (~> 2.12.0)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
     diff-lcs (1.2.5)
-    facets (3.0.0)
     ffi (1.9.10)
     ffi (1.9.10-x86-mingw32)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gherkin (2.12.2-x86-mingw32)
-      multi_json (~> 1.3)
-    gli (2.13.1)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.0)
+    gherkin (3.2.0)
+    gli (2.13.4)
+    hashie (3.4.3)
     multi_json (1.11.2)
     multi_test (0.1.2)
     ninja-gen (0.1.1.1)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    pour (0.0.3.1)
+      typespec
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    xcodeproj (0.26.3)
-      activesupport (>= 3)
-      claide (~> 0.9.1)
-      colored (~> 1.2)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    thor (0.19.1)
+    typespec (0.1.0.8)
+    visual_studio (0.1.0.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,8 @@
-# [Rubify Your Build!](http://rubifyyourbuild.com/)
+# [Rubify Your Build!](http://rubifyyourbuild.com/) 
 
 [![Gem Version](https://img.shields.io/gem/v/ryb.svg)](https://rubygems.org/gems/ryb)
 [![Build Status](https://img.shields.io/travis/mtwilliams/ryb/master.svg)](https://travis-ci.org/mtwilliams/ryb)
 [![Code Climate](https://img.shields.io/codeclimate/github/mtwilliams/ryb.svg)](https://codeclimate.com/github/mtwilliams/ryb)
 [![Dependency Status](https://img.shields.io/gemnasium/mtwilliams/ryb.svg)](https://gemnasium.com/mtwilliams/ryb)
+
+:meat_on_bone: Delicious!

data/TODO

@@ -0,0 +1,4 @@
+- How should we handle conflicts between say, a Ryb::Configuration and a Ryb::Platform?
+- Memoization.
+ - http://www.justinweiss.com/articles/4-simple-memoization-patterns-in-ruby-and-one-gem/
+ - http://gavinmiller.io/2013/basics-of-ruby-memoization/

data/bin/ryb

@@ -1,46 +1,6 @@
 #!/usr/bin/env ruby
-$:.push File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
-require 'facets'
-require 'gli'
-require 'xcodeproj'
-require 'ninja'
 
+$:.push File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ryb'
-# TODO(mtwilliams): Refactor into Ryb::Runner.
-require 'rybfile'
-
-include GLI::App
-
-# TODO(mtwilliams): Refactor this ugliness into lib/ryb.rb?
-spec = Gem::Specification::load(File.expand_path(File.join(File.dirname(__FILE__), '..', 'ryb.gemspec')))
-# program_name spec.name
-version spec.version.to_s
-program_desc spec.summary
-program_long_desc spec.description
-
-desc 'Generate project file(s)'
-# TODO(mtwilliams): Improve command-specific help.
-long_desc 'Generates project files for a specific toolset based on a Rybfile.'
-command [:g, :gen, :generate] do |c|
-  c.desc 'Automatically regenerate project file(s)'
-
-  c.action do |global_opts, opts, args|
-    # TODO(mtwilliams): Sanity checks on `args'.
-    toolset = args.shift
-    # TODO(mtwilliams): Custom exception types.
-    raise "No toolset specified!" if toolset.nil?
-    raise "Unknown toolset `#{toolset}'!" unless %w{ninja}.include? toolset
-    rybfile = args.shift || 'Rybfile'
-    raise "No such file `#{rybfile}' exists!" unless File.exists?(rybfile)
-    rybfile = Rybfile.load(rybfile)
-    puts "Generating project file(s) for `#{toolset}'..."
-    case toolset
-    when 'ninja'
-      Ryb::Ninja.generate_build_file_for rybfile.project, root: '.', built: '_build'
-    end
-  end
-end
 
-exit run(ARGV)
+exit Ryb::CommandLineInterface.run(ARGV)

data/lib/ryb.rb

@@ -1,28 +1,39 @@
 require 'rbconfig'
+require 'delegate'
+require 'hashie'
+require 'pour'
+require 'visual_studio'
+require 'ninja'
 
 module Ryb
-  def self.platform
-    @platform ||= begin
-      case RbConfig::CONFIG['host_os']
-        when /mswin|msys|mingw/
-          :windows
-        when /mac os|darwin/
-          :macosx
-        when /linux/
-          :linux
-        when /bsd/
-          :bsd
-        else
-          raise 'Unknown or unsupported platform!'
-        end
-    end
-  end
-
-  require 'ryb/version'
+  require 'ryb/gem'
 
+  require 'ryb/helpers/defaults'
+  require 'ryb/helpers/pretty_string'
+
+  require 'ryb/name'
+  require 'ryb/paths'
+  require 'ryb/languages'
+  require 'ryb/source_file'
+
+  require 'ryb/environment'
+  require 'ryb/flags'
+  require 'ryb/preprocessor'
+  require 'ryb/code'
+  require 'ryb/dependency'
+  require 'ryb/dependencies'
+  require 'ryb/configuration'
+  require 'ryb/configurations'
+  require 'ryb/product'
   require 'ryb/project'
-  require 'ryb/library'
-  require 'ryb/application'
 
+  require 'ryb/dsl'
+
+  require 'rybfile'
+  require 'rybfile/walker'
+
+  require 'ryb/visual_studio'
   require 'ryb/ninja'
+
+  require 'ryb/cli'
 end

data/lib/ryb/cli.rb

@@ -0,0 +1,103 @@
+module Ryb
+  # TODO(mtwilliams): Collate these somewhere else.
+  PLATFORMS = %w{windows macosx linux}
+  TOOLCHAINS = %w{msvc clang+llvm gcc}
+
+  module CommandLineInterface
+    # TODO(mtwilliams): Look into using Thor?
+    require 'gli'
+    include GLI::App
+    extend self
+
+  # program_name      Ryb::Gem.name
+    version           Ryb::Gem.version.to_s
+    program_desc      Ryb::Gem.summary
+    program_long_desc Ryb::Gem.description
+
+    desc ''
+    flag [:root], :default_value => '.'
+
+    desc ''
+    flag [:build], :default_value => '_build'
+
+  # TODO(mtwilliams): Use a proper logger.
+  # switch :verbose, :default => false,
+  #                  :negatable => false
+
+    desc 'Generate project file(s)'
+    long_desc 'Generates project files for a specific toolset, based on a Rybfile.'
+    command [:g, :gen, :generate] do |gen|
+      gen.action do |global_opts, opts, args|
+        # TODO(mtwilliams): Use custom exception types and refactor out error
+        # messages. This will allow us to localize, among other things.
+        raise "You failed to specify a toolset!" if args.empty?
+        toolset = args.shift
+        raise "You specified an unknown toolset `#{toolset}'!"
+      end
+
+      gen.command :visual_studio do |vs|
+        # BUG(mtwilliams): Descriptions aren't being made available.
+        vs.desc 'Generate Visual Studio project files'
+        vs.long_desc 'Generates Visual Studio projects files, based on a Rybfile.'
+        vs.action do |global_opts, opts, args|
+          rybfile = Rybfile.load(args.shift || "Rybfile")
+          raise "Not implemented, yet."
+        end
+      end
+
+      gen.command :xcode do |xcode|
+        # BUG(mtwilliams): Descriptions aren't being made available.
+        xcode.desc 'Generate XCode project files'
+        xcode.long_desc 'Generates XCode projects files, based on a Rybfile.'
+        xcode.action do |global_opts, opts, args|
+          rybfile = Rybfile.load(args.shift || "Rybfile")
+          raise "Not implemented, yet."
+        end
+      end
+
+      gen.command :gmake do |gmake|
+        # BUG(mtwilliams): Descriptions aren't being made available.
+        gmake.desc 'Generate GNU Makefiles'
+        gmake.long_desc 'Generates GNU Makefiles, based on a Rybfile.'
+        gmake.action do |global_opts, opts, args|
+          rybfile = Rybfile.load(args.shift || "Rybfile")
+          raise "Not implemented, yet."
+        end
+      end
+
+      gen.command :ninja do |ninja|
+        # BUG(mtwilliams): Descriptions aren't being made available.
+        ninja.desc 'Generate Ninja build files'
+        ninja.long_desc 'Generates a build.ninja file for a specific toolchain, based on a Rybfile.'
+        ninja.flag 'for', :default_value => 'latest',
+                          :type => String,
+                          :arg_name => 'for',
+                          :desc => 'The toolchain to use'
+
+        ninja.action do |global_opts, opts, args|
+          rybfile = Rybfile.load(args.shift || "Rybfile")
+
+          # # TODO(mtwilliams): Refactor out.
+          # # TODO(mtwilliams): Verify every platform+architecture is supported.
+          # targets = [*global_opts[:targets].split(';')].flat_map { |platform, architectures|
+          #   architectures = [*(architectures.split(',') || ['*'])]
+          #   [].fill(platform, 0, architectures.length).zip(architectures)
+          # }
+
+          # toolchains = begin
+          #   pairings = global_opts[:toolchains].split(',')
+          #   Hash[pairings.map { |pairing|
+          #     platform, toolchain = *pairing.split(':')
+          #     [platform, toolchain]
+          #   }]
+          # end
+
+          Ryb::Ninja.generate_from(rybfile, root: global_opts[:root],
+                                            build: global_opts[:build],
+                                            targets: ['windows'],
+                                            toolchains: ['msvc'])
+        end
+      end
+    end
+  end
+end

data/lib/ryb/code.rb

@@ -0,0 +1,7 @@
+module Ryb
+  module Code
+    include Pour::Pourable
+
+    property :sources, Typespec.array[Typespec.t[SourceFile]]
+  end
+end

data/lib/ryb/configuration.rb

@@ -1,16 +1,22 @@
-require 'ryb/name'
-require 'ryb/properties'
-
 module Ryb
-  class Configuration
-    include Properties::Named
-    include Properties::Suffix
-    include Properties::Defines
-    include Properties::Flags
+  class Configuration < Pour::Mould
+    property :name, Typespec.t[Name]
+
+    property :prefix, Typespec.string
+    property :suffix, Typespec.string
+
+    pour Environment
+    pour Preprocessor
+    pour Flags
+
+    pour Code
+
+    pour Dependencies
+  end
+
+  class Platform < Configuration
+  end
 
-    def initialize(name, opts={})
-      @name = Name.new(name, opts[:pretty])
-      yield self if block_given?
-    end
+  class Architecture < Configuration
   end
 end

data/lib/ryb/configurations.rb

@@ -0,0 +1,9 @@
+module Ryb
+  module Configurations
+    include Pour::Pourable
+
+    property :configurations, Typespec.array[Typespec.t[Configuration]]
+    property :platforms,      Typespec.array[Typespec.t[Platform]]
+    property :architectures,  Typespec.array[Typespec.t[Architecture]]
+  end
+end

data/lib/ryb/dependencies.rb

@@ -0,0 +1,7 @@
+module Ryb
+  module Dependencies
+    include Pour::Pourable
+
+    property :dependencies, Typespec.array[Typespec.t[Dependency]]
+  end
+end

data/lib/ryb/dependency.rb

@@ -0,0 +1,30 @@
+module Ryb
+  class Dependency < Pour::Mould
+  end
+
+  class InternalDependency < Dependency
+    property :product, Typespec.symbol
+
+    def initialize(product)
+      self.product = product
+    end
+
+    alias :eql? :==
+    def ==(other)
+      self.product == other.product
+    end
+  end
+
+  class ExternalDependency < Dependency
+    property :lib_or_framework, Typespec.string
+
+    def initialize(lib_or_framework)
+      self.lib_or_framework = lib_or_framework
+    end
+
+    alias :eql? :==
+    def ==(other)
+      self.lib_or_framework == other.lib_or_framework
+    end
+  end
+end