twee2 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80fdeb6e878761f0e195156ed16776fdc086b1cf
-  data.tar.gz: 575b4e716c1b2594c9cde614b221403541a759e6
+  metadata.gz: 5398fec3430c5139d62f6d413df6481fbb125e8c
+  data.tar.gz: f78a473f5417d415893d0ce53cc22e7c115d736b
 SHA512:
-  metadata.gz: 55b0a31d371fa8cfc7ddb4a96f98d970670aa6080f8eecf929f5f079d5ebac9d5e4b6242b97a23838f632025d208094396c716a6753b810bd6026ce13bcd97ef
-  data.tar.gz: 4e54befc3dac3dcaa6a5d92b318230c590b84a9916847a1abb2887bdde3c13697f05b632d576b56c8c10393f720435bcc108914a911e36135a1143b36c51a082
+  metadata.gz: 2109f1466112cde4ab400d26e463d92480d8926bd0183d49a7e7a1e196eff0e9371c932a1601c1058fe8f0ffa9bf44183d3049e882fb6113efe676aa9e047153
+  data.tar.gz: 0b020b7a8e362aefd5c3a094b5551cf0e329d364cb911cc19d2dec69d21d6b929df4f99c74ad7724b9a91e92f2b8463efc55b5256c0ca9ecbce6aec32c9f17ae

data/README.md

@@ -1,8 +1,10 @@
 # Twee2
 
-Command-line tool to compile Twee-style (.tw, .twine) interactive fiction source files to Twine 2-style (non-Tiddlywiki) output.
+Command-line tool to compile Twee-style (.tw, .twine) interactive fiction source files to [Twine 2](http://twinery.org/)-style output. Use your favourite text editor to write Twine 2 interactive fiction.
 
-Designed for those who preferred the Twee (for Twine 1) approach to source management, because the command-line is awesome, but who want to take advantage of the new features in Twine 2. Note that this is NOT a Twine 1 to Twine 2 converter, although parts of its functionality go some way to achieving this goal.
+Designed for those who preferred the Twee approach to source management, because the command-line is awesome, but who want to take advantage of the new features in Twine 2. With a little work, this tool may also function as a partial Twine 1 to Twine 2 converter.
+
+For installation and usage, see https://avapoet.github.io/twee2/
 
 ## Philosophy
 
@@ -10,13 +12,7 @@ Designed for those who preferred the Twee (for Twine 1) approach to source manag
 
 I love the direction that Twine 2 has been going in, in regard to ditching the old Tiddlywiki backend and making it easier than ever for developers to integrate their own CSS and Javascript into their stories. However, as a fan of plain-old text editors and not of IDEs, I'm not so keen on the fact that it's now almost-impossible to develop a Twine adventure from the command-line only (there's no "Twee" equivalent for Twine 2). For my own benefit and enjoyment, I aim to fill that gap. If it helps you too, then that's just a bonus.
 
-Right now Twee2 doesn't even support the diversity of original Twee, and it's possible that it never will. As the need arises, though, I may add additional features that seemed to be 'missing' from Twee, to me.
-
-I'd love to hear your thoughts about the future of this gem.
-
-## Prerequisites
-
-You'll need Ruby. Instructions on easily installing it on MacOS, Windows, and Linux can be found at https://www.ruby-lang.org/en/documentation/installation/.
+I'd love to hear your thoughts about the future of this gem. Pull requests are also welcome.
 
 ## Installation
 
@@ -24,11 +20,9 @@ Install using gem
 
     gem install twee2
 
-## Usage
-
-To see usage examples and fuller instructions (documentation on this page is lacking, but as-yet no documentation is complete):
+* [Full installation instructions](https://avapoet.github.io/twee2/install.html).
 
-    twee2
+## Basic Usage
 
 To compile a Twee file into a HTML file using the default format (Harlowe):
 
@@ -38,80 +32,25 @@ To use a specific format, e.g. Snowman:
 
     twee2 build inputfile.twee outputfile.html --format=Snowman
 
-For additional features (e.g. listing known formats, watch-for-changes mode), run twee2 without any parameters.
+For additional features (e.g. listing known formats, watch-for-changes mode), run twee2 without any parameters. Or see the full documentation at https://avapoet.github.io/twee2/documentation.html.
 
 ## Special features
 
-Aside from the regular Twee features, Twee2 provides the following enhancements:
-
-### Multi-file inclusion (super-experimental)
-
-You can combine multiple input files into one via either (or both!) of two different methods:
-
-#### StoryIncludes
-
-Borrowed from Twee: simply list the files to include in the special StoryIncludes passage. Each will be appended to the end of your source file on compilation.
-
-```
-::StoryIncludes
-my-sub-story.tw2
-```
-
-Looking for something more-powerful? Use ::@include-syntax, e.g.:
-
-```
-::IncompleteRoom [haml]
-%p
-  This room is incomplete. Come back later.
-:coffeescript
-  ::@include incomplete-room-js.coffee
-```
-
-The requested file will be nested directly in place. Indent levels will be preserved, which makes it safe for use within HAML, Coffeescript, and SASS. This makes it easy to re-use content throughout your story by simply inserting it in multiple places.
-
-### HAML support
-
-You can declare your passages using [HAML markup](http://haml.info/docs/yardoc/file.REFERENCE.html) by applying a 'haml' tag to the passage, e.g.:
-
-```
-::DarkCorridor [haml]
-%p
-  The floorboards creak beneath your feet as you creep into the darkness of the corridor.
-```
-
-### Coffeescript
-
-If you'd rather write your Javascript in [Coffeescript](http://coffeescript.org/) style, just use a HAML ':coffeescript' block or tag your 'script' block with 'coffee':
-
-```
-::MyJavascripts [coffee script]
-  $ ->
-    alert 'Welcome to my game!'
-```
-
-### SASS/SCSS stylesheets
-
-Prefer SASS for your stylesheets? Just use a 'sass' or 'scss' tag alongside your 'stylesheet' tag, or use a :sass or :scss block in HAML:
+Aside from the obvious benefits of a "use your own editor" solution, Twee2 provides the following enhancements over Twine 2:
 
-```
-::MyStylesheet [scss stylesheet]
-body {
-  color: #eee;
-}
-tw-passage {
-  tw-link {
-    color: red;
-  }
-}
-```
+* Multi-file inclusion - spread your work over multiple files to improve organisation, facilitate better source control, collaborate with others, or make re-usable modules.
+* [HAML](http://haml.info/) support - for those who prefer HAML to Markdown, and for advanced embedding of scripting into passages.
+* [Coffeescript](http://coffeescript.org/) transpiler - optionally write your Javascript in Coffeescript for a smarter, lighter syntax.
+* [SASS/SCSS](http://sass-lang.com/) stylesheets - optionally enhance your CSS with syntactic awesome.
+* Ruby-powered dynamic generation - automate parts of your build chain (e.g. how about a procedurally-built maze of twisty little passages... or even something actually *good*) with Ruby scripting
+* Twine 2 decompilation - reverse-engineer Twine 2 stories into Twee2 source code to convert your projects or to understand other people's.
 
 ## Notes
 
-* This is not a Twee to Harlowe converter. You'll still need to change your macros as described at http://twine2.neocities.org/, and/or rewrite them as Javascript code.
-* Some special story segments (e.g. StorySubtitle) are ignored. You will be warned when this happens.
-* The HTML files that are produced by this can not be readily re-opened by Twine 2 (I think it's because of the missing passage coordinate data).
-* Seriously: this is very-much an experiment and you probably shouldn't use it.
+* This is not a Twee to Harlowe converter. You'll still need to change your macros as described at http://twine2.neocities.org/, and/or rewrite them as Javascript code. However, it might help your efforts to update Twee sources to Twine 2 output.
+* Some special story segments (e.g. StorySubtitle) used in Twee 1 are ignored. You will be warned when this happens.
+* The Twine 2 editor might not be able to re-open stories compiled using Twee2, because Twee2 does not automatically include positional data used by the visual editor (however, you can add this manually if you like).
 
 ## License
 
-This code is released under the GPL, version 2. It includes code (in the storyFormats directory) by other authors, including Leon Arnott: please read their licenses before redistributing.
+This code is released under the GPL, version 2. It includes code (in the storyFormats directory) by other authors, including Leon Arnott: please read their licenses before redistributing.

data/lib/twee2.rb

@@ -28,6 +28,16 @@ module Twee2
         exit
       end
     end
+    # Load story format, if for some reason Twee2::build_config.story_format is set to a string rather than an instance
+    if build_config.story_format.is_a?(String)
+      new_format = build_config.story_format
+      begin
+        build_config.story_format = StoryFormat::new(new_format)
+      rescue StoryFormatNotFoundException
+        puts "ERROR: story format '#{new_format}' not found."
+        exit
+      end
+    end
     # Warn if IFID not specified
     if !build_config.story_ifid_specified
       puts "NOTICE: You haven't specified your IFID. Consider adding to your code -"

data/lib/twee2/version.rb

@@ -1,3 +1,3 @@
 module Twee2
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/web/build/documentation.html

@@ -8,8 +8,8 @@
     </title>
     <meta content='IE=edge' http-equiv='X-UA-Compatible'>
     <meta content='width=device-width, initial-scale=1' name='viewport'>
-    <link href="/stylesheets/all.css" rel="stylesheet" />
-    <script src="/javascripts/all.js"></script>
+    <link href='stylesheets/all.css' rel='stylesheet'>
+    <script src='javascripts/all.js'></script>
   </head>
   <body>
     <div class='navbar navbar-default navbar-static-top'>

data/web/build/index.html

@@ -8,8 +8,8 @@
     </title>
     <meta content='IE=edge' http-equiv='X-UA-Compatible'>
     <meta content='width=device-width, initial-scale=1' name='viewport'>
-    <link href="/stylesheets/all.css" rel="stylesheet" />
-    <script src="/javascripts/all.js"></script>
+    <link href='stylesheets/all.css' rel='stylesheet'>
+    <script src='javascripts/all.js'></script>
   </head>
   <body>
     <div class='navbar navbar-default navbar-static-top'>

data/web/build/install.html

@@ -8,8 +8,8 @@
     </title>
     <meta content='IE=edge' http-equiv='X-UA-Compatible'>
     <meta content='width=device-width, initial-scale=1' name='viewport'>
-    <link href="/stylesheets/all.css" rel="stylesheet" />
-    <script src="/javascripts/all.js"></script>
+    <link href='stylesheets/all.css' rel='stylesheet'>
+    <script src='javascripts/all.js'></script>
   </head>
   <body>
     <div class='navbar navbar-default navbar-static-top'>

data/web/build/tutorial.html

@@ -8,8 +8,8 @@
     </title>
     <meta content='IE=edge' http-equiv='X-UA-Compatible'>
     <meta content='width=device-width, initial-scale=1' name='viewport'>
-    <link href="/stylesheets/all.css" rel="stylesheet" />
-    <script src="/javascripts/all.js"></script>
+    <link href='stylesheets/all.css' rel='stylesheet'>
+    <script src='javascripts/all.js'></script>
   </head>
   <body>
     <div class='navbar navbar-default navbar-static-top'>

data/web/source/layouts/layout.haml

@@ -7,8 +7,8 @@
       = " | #{current_page.data.title}" if current_page.data.title
     %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge'}
     %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
-    = stylesheet_link_tag 'all'
-    = javascript_include_tag 'all'
+    %link{href: 'stylesheets/all.css', rel: 'stylesheet'}/
+    %script{src: 'javascripts/all.js'}
   %body
     .navbar.navbar-default.navbar-static-top
       .container

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twee2
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dan Q
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Command-line tool to compile Twee-style (.tw, .twine) interactive fiction